Skip to content

Commit

Permalink
fixed some series for Jimmy and a sign fix for flextable
Browse files Browse the repository at this point in the history
  • Loading branch information
@bentut
bentut committed May 27, 2014
1 parent 52c0402 commit 4ea5f82
Show file tree
Hide file tree
Showing 10 changed files with 1,738 additions and 1,790 deletions.
6 changes: 3 additions & 3 deletions app/mailers/packager_mailer.rb
View file
Expand Up @@ -16,7 +16,7 @@ def rake_notification(rake_task, download_results, errors, series, output_path,
@dates = Series.get_all_dates_from_data(@series)
subject = "UDAMAN Error (#{rake_task})" if is_error
subject = "UDAMAN New Download (#{rake_task})" unless is_error
mail(:to => ["btrevino@hawaii.edu"], :subject => subject)
mail(:to => ["btrevino@hawaii.edu","jonpage.econ@gmail.com"], :subject => subject)
end

def rake_error(e, output_path)
Expand All @@ -29,7 +29,7 @@ def visual_notification(new_dps = 0, changed_files = 0, new_downloads = 0)
attachments.inline['photo.png'] = File.read('/Users/Shared/Dev/udaman/script/investigate_visual.png')
attachments['photo.png'] = File.read('/Users/Shared/Dev/udaman/script/investigate_visual.png')
subject = "Udaman Download Report: #{new_dps.to_s + " new data points / " unless new_dps == 0} #{new_downloads.to_s + " updated downloads / " unless new_downloads == 0} #{changed_files.to_s + " modified update spreadsheets" unless changed_files == 0}"
mail(:to => ["btrevino@hawaii.edu", "james29@hawaii.edu", "icintina@gmail.com", "fuleky@hawaii.edu"], :subject => subject)
mail(:to => ["btrevino@hawaii.edu", "james29@hawaii.edu", "fuleky@hawaii.edu", "jonpage.econ@gmail.com"], :subject => subject)
#mail(:to => ["bentut@gmail.com"], :subject => subject)
end

Expand All @@ -47,7 +47,7 @@ def website_post_notification(post_name, post_address, new_data_series, created)
subject = "Udaman tried but failed to post new data for #{post_name} to the UHERO website" unless created
@post_address = post_address
@new_data_series = new_data_series
mail(:to => ["btrevino@hawaii.edu","james29@hawaii.edu", "icintina@gmail.com"], :subject => subject) #{})
mail(:to => ["btrevino@hawaii.edu","james29@hawaii.edu", "jonpage.econ@gmail.com"], :subject => subject) #{})
end

def prognoz_notification(recipients, send_edition)
Expand Down
12 changes: 6 additions & 6 deletions app/views/data_lists/super_table.html.erb
View file
Expand Up @@ -158,9 +158,9 @@
header.append("th").text("").attr("class", "spark_col");
header.append("th").html(head_html("Last Obs","date", "YTD %chg")).attr("class", "calc sel_col");
header.append("th").html(head_html("Min Obs","date", "Last - Min")).attr("class", "calc min_col");
header.append("th").html(head_html("Max Obs","date", "Max - Last")).attr("class", "calc max_col");
header.append("th").html(head_html("Max Obs","date", "Last - Max")).attr("class", "calc max_col");
header.append("th").html(head_html("%chg fr first","%chg fr min", "%chg fr max")).attr("class", "calc chg_col");
header.append("th").html(head_html("Max - Min","Last-Min/Max-Min", "Max-Last/Max-Min")).attr("class", "calc range_col");
header.append("th").html(head_html("Max - Min","Last-Min/Max-Min", "Last-Max/Max-Min")).attr("class", "calc range_col");

header
.selectAll("th.date_col")
Expand Down Expand Up @@ -230,7 +230,7 @@

var data = d3.entries(d.value.data).filter(function(elem) {
return (elem.value.value != null) && (elem.key >= start_date && elem.key <= end_date);
});
}).sort(function(a,b) { return d3.ascending(a.key, b.key)});

if (data.length === 0) //for undefined series
return [{col_name:"sel", value:"", yoy:"", yoy_diff:""},
Expand All @@ -257,13 +257,13 @@
var max_elem = sorted_data[sorted_data.length-1];
var max = max_elem.value.value;
var max_date = max_elem.key;
var max_diff = max-sp_val;
var max_diff = sp_val-max;

return [{col_name:"sel", value:f(sp_val), yoy:date_h(sp.key,frequency), yoy_diff:perc(sp.value.ytd)},
{col_name:"min", value:f(min), yoy:date_h(min_date,frequency), yoy_diff:f(min_diff)},
{col_name:"max", value:f(max), yoy:date_h(max_date,frequency), yoy_diff:f(max_diff)},
{col_name:"chg", value:perc((sp_val-fp_val)/fp_val*100), yoy:perc((sp_val-min)/min*100), yoy_diff:perc((max-sp_val)/max*100)},
{col_name:"range", value:f(max-min), yoy:perc((sp_val-min)/(max-min)*100), yoy_diff:perc((max-sp_val)/(max-min)*100)}];
{col_name:"chg", value:perc((sp_val-fp_val)/fp_val*100), yoy:perc((sp_val-min)/min*100), yoy_diff:perc((sp_val-max)/max*100)},
{col_name:"range", value:f(max-min), yoy:perc((sp_val-min)/(max-min)*100), yoy_diff:perc((sp_val-max)/(max-min)*100)}];
}

function calc_html(d) {
Expand Down
24 changes: 12 additions & 12 deletions app/views/data_lists/tsd_super_tableview.html.erb
View file
Expand Up @@ -166,9 +166,9 @@
header.append("th").text("").attr("class", "spark_col");
header.append("th").html(head_html("Last Obs","date", "YTD %chg")).attr("class", "calc sel_col");
header.append("th").html(head_html("Min Obs","date", "Last - Min")).attr("class", "calc min_col");
header.append("th").html(head_html("Max Obs","date", "Max - Last")).attr("class", "calc max_col");
header.append("th").html(head_html("Max Obs","date", "Last - Max")).attr("class", "calc max_col");
header.append("th").html(head_html("%chg fr first","%chg fr min", "%chg fr max")).attr("class", "calc chg_col");
header.append("th").html(head_html("Max - Min","Last-Min/Max-Min", "Max-Last/Max-Min")).attr("class", "calc range_col");
header.append("th").html(head_html("Max - Min","Last-Min/Max-Min", "Last-Max/Max-Min")).attr("class", "calc range_col");

header
.selectAll("th.date_col")
Expand Down Expand Up @@ -240,40 +240,40 @@

var data = d3.entries(d.value.data).filter(function(elem) {
return (elem.value.value != null) && (elem.key >= start_date && elem.key <= end_date);
});
}).sort(function(a,b) { return d3.ascending(a.key, b.key)});

if (data.length === 0) //for undefined series
return [{col_name:"sel", value:"", yoy:"", yoy_diff:""},
{col_name:"min", value:"", yoy:"", yoy_diff:""},
{col_name:"max", value:"", yoy:"", yoy_diff:""},
{col_name:"chg", value:"", yoy:"", yoy_diff:""},
{col_name:"range", value:"", yoy:"", yoy_diff:""}];

var sp = data[data.length-1]; //selected_point = last point for now
var sp_val = sp.value.value;

var fp = data[0]; //first point
var fp_val = fp.value.value

var sorted_data = data.sort(function(a,b) {
return d3.ascending(a.value.value, b.value.value);
});

var min_elem = sorted_data[0];
var min = min_elem.value.value;
var min_date = min_elem.key;
var min_diff = sp_val - min;

var max_elem = sorted_data[sorted_data.length-1];
var max = max_elem.value.value;
var max_date = max_elem.key;
var max_diff = max-sp_val;
var max_diff = sp_val-max;

return [{col_name:"sel", value:f(sp_val), yoy:date_h(sp.key,frequency), yoy_diff:perc(sp.value.ytd)},
{col_name:"min", value:f(min), yoy:date_h(min_date,frequency), yoy_diff:f(min_diff)},
{col_name:"max", value:f(max), yoy:date_h(max_date,frequency), yoy_diff:f(max_diff)},
{col_name:"chg", value:perc((sp_val-fp_val)/fp_val*100), yoy:perc((sp_val-min)/min*100), yoy_diff:perc((max-sp_val)/max*100)},
{col_name:"range", value:f(max-min), yoy:perc((sp_val-min)/(max-min)*100), yoy_diff:perc((max-sp_val)/(max-min)*100)}];
{col_name:"chg", value:perc((sp_val-fp_val)/fp_val*100), yoy:perc((sp_val-min)/min*100), yoy_diff:perc((sp_val-max)/max*100)},
{col_name:"range", value:f(max-min), yoy:perc((sp_val-min)/(max-min)*100), yoy_diff:perc((sp_val-max)/(max-min)*100)}];
}

function calc_html(d) {
Expand Down

0 comments on commit 4ea5f82

Please sign in to comment.