From 31bed7f83eafd9bc2c120cc0f68e98bdce11e947 Mon Sep 17 00:00:00 2001 From: Airistotal Date: Fri, 24 Jul 2015 07:56:12 -0500 Subject: [PATCH] Changed zoom on graphs Changed graph title Fixed flake errors --- client/galaxy/scripts/reports_webapp/run_stats.js | 4 ++-- lib/galaxy/webapps/reports/controllers/home.py | 2 +- static/maps/reports_webapp/run_stats.js.map | 2 +- static/scripts/reports_webapp/run_stats.js | 2 +- templates/webapps/reports/run_stats.mako | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/galaxy/scripts/reports_webapp/run_stats.js b/client/galaxy/scripts/reports_webapp/run_stats.js index 0e06ade766a..a372a61888a 100644 --- a/client/galaxy/scripts/reports_webapp/run_stats.js +++ b/client/galaxy/scripts/reports_webapp/run_stats.js @@ -43,7 +43,7 @@ function create_chart( inp_data, name, time, title ) { require( ["d3"], function (e) { var data = inp_data; var margin = {top: 60, right: 30, bottom: 50, left: 60}; - var chart_zoom = 1.8; + var chart_zoom = 1.75; function click() { var classes = d3.select(this).attr("class"); @@ -255,7 +255,7 @@ function create_histogram( inp_data, name, time, title ) { require( ["d3"], function (e) { //inp_data is an array of numbers that are the amount of minutes per run var data = inp_data; - var chart_zoom = 1.8; + var chart_zoom = 1.75; // Formatters for counts and times (converting numbers to Dates). function click(d) { var classes = d3.select(this).attr("class") diff --git a/lib/galaxy/webapps/reports/controllers/home.py b/lib/galaxy/webapps/reports/controllers/home.py index fa304fe13d3..d87741d2a4b 100644 --- a/lib/galaxy/webapps/reports/controllers/home.py +++ b/lib/galaxy/webapps/reports/controllers/home.py @@ -104,7 +104,7 @@ class HomePage( BaseUIController, ReportQueryBuilder ): day = (end_day + month_range) - start_day else: day = end_day - start_day - + if(day < 30): jf_dy_data[int(day)] += 1 diff --git a/static/maps/reports_webapp/run_stats.js.map b/static/maps/reports_webapp/run_stats.js.map index 4c2211b01af..1c8b093ef60 100644 --- a/static/maps/reports_webapp/run_stats.js.map +++ b/static/maps/reports_webapp/run_stats.js.map @@ -1 +1 @@ -{"version":3,"file":"run_stats.js","sources":["../../src/reports_webapp/run_stats.js"],"names":["date_by_subtracting_days","date","days","Date","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","getMilliseconds","date_by_adding_hours","hours","get_utc_time","getUTCFullYear","getUTCMonth","getUTCDate","getUTCHours","getUTCMinutes","getUTCSeconds","refresh","window","location","reload","create_chart","inp_data","name","time","title","require","click","classes","d3","select","this","attr","split","selectAll","filter","transition","duration","chart_height","chart_width","chart_zoom","data","margin","top","right","bottom","left","height","max","zoom","$","css","width","barWidth","chart","on","bar","enter","append","d","i","curr_margin","size","wdth","event","path","text","x","scale","utc","domain","rangeRound","xAxis","svg","axis","tickPadding","tickFormat","format","ticks","orient","tickSize","outerTickSize","nice","call","style","node","getBBox","left_pad","getBoundingClientRect","top_pad","trans","info","y","linear","range","yAxis","round","create_histogram","formatMinutes","Math","floor","minutes","lengths","layout","histogram","bins","length","push","bar_x","undefined","dx","setTimeout"],"mappings":"AAAA,QAASA,0BAAyBC,EAAMC,GACpC,MAAO,IAAIC,MACPF,EAAKG,cACLH,EAAKI,WACLJ,EAAKK,UAAYJ,EACjBD,EAAKM,WACLN,EAAKO,aACLP,EAAKQ,aACLR,EAAKS,mBAIb,QAASC,sBAAqBV,EAAMW,GAChC,MAAO,IAAIT,MACPF,EAAKG,cACLH,EAAKI,WACLJ,EAAKK,UACLL,EAAKM,WAAaK,EAClBX,EAAKO,aACLP,EAAKQ,aACLR,EAAKS,mBAIb,QAASG,gBACL,GAAIZ,GAAO,GAAIE,KACf,OAAO,IAAIA,MACXF,EAAKa,iBACLb,EAAKc,cACLd,EAAKe,aACLf,EAAKgB,cACLhB,EAAKiB,gBACLjB,EAAKkB,iBAIT,QAASC,WACLC,OAAOC,SAASC,QAAO,GAI3B,QAASC,cAAcC,EAAUC,EAAMC,EAAMC,GACzCC,SAAU,MAAO,WAKb,QAASC,KACL,GAAIC,GAAUC,GAAGC,OAAOC,MAAMC,KAAK,QACnCJ,GAAUA,EAAQK,MAAM,KACxBJ,GAAGK,UAAU,IAAMN,EAAQ,IAAIO,OAAO,IAAMP,EAAQ,IAC/CQ,aACIC,SAAS,KACTL,KAAK,SAAUM,GACfN,KAAK,QAASO,GAEvBV,GAAGC,OAAOC,MACLK,aACIC,SAAS,KACTL,KAAK,SAAUM,EAAaE,GAC5BR,KAAK,QAASO,EAAYC,GAjBvC,GAAIC,GAAOnB,EACPoB,GAAUC,IAAK,GAAIC,MAAO,GAAIC,OAAQ,GAAIC,KAAM,IAChDN,EAAa,IAkBbO,EAAS,GACb,IAAmB,GAAhBlB,GAAGmB,IAAIP,GACN,GAAIQ,GAAOF,EAASlB,GAAGmB,IAAIP,OAE3B,IAAIQ,GAAO,CAEf,IAAIX,GAAeS,EAASL,EAAOC,IAAMD,EAAOG,MAChDK,GAAE,WAAWC,IAAI,SAAUb,EAAe,EAE1C,IAAIc,GAAQ,IACRC,EAAW,CACJ,UAAR7B,EACC6B,EAAWD,EAAQ,GACL,QAAR5B,IACN6B,EAAWD,EAAQ,GAEvB,IAAIb,GAAca,EAAQV,EAAOI,KAAOJ,EAAOE,MAE3CU,EAAQzB,GAAGC,OAAO,IAAMP,GACvBS,KAAK,QAASO,GACdP,KAAK,SAAUO,GACfP,KAAK,sBAAuB,YAC5BA,KAAK,UAAW,OAASO,EAAc,IAAMD,GAC7CiB,GAAG,QAAS5B,GAEb6B,EAAMF,EAAMpB,UAAU,KACrBO,KAAKA,GACLgB,QAAQC,OAAO,KACX1B,KAAK,YAAa,SAAS2B,EAAGC,GAG3B,MAFAC,cAAenB,EAAOI,KACtBe,eAAiBD,EAAIP,GACd,aAAeQ,YAAc,IAAMnB,EAAOC,IAAM,MAE1DY,GAAG,aAAc,SAASI,GAIvB,IAHA,GAAIC,GAAI,EACJE,EAAOH,EAEJG,GAAQ,GACXA,GAAc,GACdF,GAGJ,IAAIG,GAAY,EAAJH,EAAS,EACrB/B,IAAGC,OAAOD,GAAGmC,MAAMC,KAAK,IAAInC,OAAO,aAC9BA,OAAO,QACHE,KAAK,YAAa,eAAiBU,EAAOI,KAAO,GAAK,MAASC,EAAUY,EAAIV,IAAUP,EAAOC,IAAM,IAAM,MAC1GX,KAAK,aAAc,WACnBkC,KAAKP,GAEd9B,GAAGC,OAAOD,GAAGmC,MAAMC,KAAK,IAAInC,OAAO,aAC9BE,KAAK,QAAS+B,EAAO,MACrB/B,KAAK,SAAU,QACfF,OAAO,QACHE,KAAK,YAAa,gBAAmBU,EAAOI,KAAQiB,GAAQ,MAAShB,EAAUY,EAAIV,IAAUP,EAAOC,KAAO,MAC3GX,KAAK,QAAS+B,EAAO,MACrB/B,KAAK,SAAU,QACfA,KAAK,OAAO,aAExBuB,GAAG,aAAc,SAASI,GACvB9B,GAAGC,OAAOD,GAAGmC,MAAMC,KAAK,IAAInC,OAAO,aAC9BA,OAAO,QACHE,KAAK,aAAc,UAE5BH,GAAGC,OAAOD,GAAGmC,MAAMC,KAAK,IAAInC,OAAO,aAC9BA,OAAO,QACHE,KAAK,QAAS,KACdA,KAAK,SAAU,KACfA,KAAK,OAAO,IACZkC,KAAKP,IAW1B,IATAL,EAAMI,OAAO,KACRA,OAAO,QACP1B,KAAK,QAAS,SACdA,KAAK,cAAe,OACpBA,KAAK,YAAa,WACf,MAAO,cAAgBoB,EAAQ,UAElCc,KAAKzC,GAEE,SAARD,EACA,GAAI2C,GAAItC,GAAGL,KAAK4C,MAAMC,MACjBC,QAAQ5D,eAAgBb,yBAAyBa,eAAgB,KACjE6D,YAAY,EAAGnB,IAEhBoB,EAAQ3C,GAAG4C,IAAIC,OACdN,MAAMD,GACNQ,YAAY,GACZC,WAAW/C,GAAGL,KAAKqD,OAAO,aAC1BC,MAAMjD,GAAGL,KAAKf,MAAO,GACrBsE,OAAO,UACPC,SAAS,GACTC,cAAc,OAChB,IAAY,QAARzD,EACP,GAAI2C,GAAItC,GAAGL,KAAK4C,MAAMC,MACjBC,QAAQ5D,eAAgBb,yBAAyBa,eAAgB,MACjE6D,YAAY,EAAGnB,IACf8B,OAEDV,EAAQ3C,GAAG4C,IAAIC,OACdN,MAAMD,GACNQ,YAAY,GACZC,WAAW/C,GAAGL,KAAKqD,OAAO,UAC1BC,MAAMjD,GAAGL,KAAKzB,KAAM,GACpBgF,OAAO,UACPC,SAAS,GACTC,cAAc,EAGvB3B,GAAMI,OAAO,KACR1B,KAAK,QAAS,UACdA,KAAK,KAAO,KAAOT,GACnBS,KAAK,YAAa,gBAAkBU,EAAOI,KAAQ,MAAQC,IAAUL,EAAOC,KAAO,KACnFwC,KAAKX,GACDtC,UAAU,QACVkD,MAAM,cAAe,OACrBpD,KAAK,YAAa,WACf,MAAO,kBAAoBH,GAAGC,OAAOC,MAAMsD,OAAOC,UAAUvC,OAAS,MAGjFO,EAAMI,OAAO,KACRA,OAAO,QACH1B,KAAK,QAAS,YACdA,KAAK,YAAa,WACf,GAAI0C,GAAO7C,GAAGC,OAAO,MAAQP,GAAM8D,OAC/BE,GAAY7C,EAAOI,KAAQ4B,EAAKc,wBAAwBpC,MAAM,EAAK,GACnEqC,GAAW/C,EAAOC,IAAMI,EAAS2B,EAAKc,wBAAwBzC,OAAS,GACvE2C,EAAQ,aAAeH,EAAW,IAAME,EAAU,GAEtD,OAAOC,KAEVxB,KAAK,WACF,GAAIyB,GAAO,EAMX,OALW,SAARnE,EACCmE,EAAO,uBACO,QAARnE,IACNmE,EAAO,mBAEJA,GAGnB,IAAIC,GAAI/D,GAAGuC,MAAMyB,SACZC,OAAO/C,EAAQ,IAEhBgD,EAAQlE,GAAG4C,IAAIC,OACdN,MAAMwB,GACNb,OAAO,QACPH,WAAY,SAASjB,GAAK,MAAO9B,IAAGmE,MAAOrC,EAAE9B,GAAGmB,IAAIP,GAAO,IAEhEa,GAAMI,OAAO,KACR1B,KAAK,QAAS,UACdA,KAAK,KAAO,KAAOT,GACnBS,KAAK,cAAe,OACpBA,KAAK,YAAa,cAAgBU,EAAOI,KAAO,IAAMJ,EAAOC,IAAM,KACnEwC,KAAKY,GACDjE,OAAO,WAEhBwB,EAAMI,OAAO,KACRA,OAAO,QACH1B,KAAK,QAAS,YACdA,KAAK,YAAa,WACf,GAAI0C,GAAO7C,GAAGC,OAAO,MAAQP,GAAM8D,OAC/BE,GAAY7C,EAAOI,KAAO4B,EAAKc,wBAAwBpC,MAAQ,EAC/DqC,GAAW/C,EAAOC,IAAO+B,EAAKc,wBAAwBzC,OAAO,EAAK,GAClE2C,EAAQ,aAAeH,EAAW,IAAME,EAAU,cAEtD,OAAOC,KAEVxB,KAAK,kBAEdV,EAAIE,OAAO,QACN1B,KAAK,IAAK,SAAS2B,GAAK,MAAOZ,GAAUY,EAAIV,IAC7CjB,KAAK,SAAU,SAAS2B,GAAK,MAAQA,GAAIV,IACzCjB,KAAK,QAASqB,EAAW,GAE9BC,EAAMI,OAAO,KACR1B,KAAK,QAAS,YACd0B,OAAO,QACZJ,EAAMxB,OAAO,aACR4B,OAAO,SAED,eAARnC,GAAiC,eAARA,IACxBM,GAAGC,OAAO,IAAMP,GACXS,KAAK,SAAUM,EAAeE,GAC9BR,KAAK,QAASO,EAAcC,KAO7C,QAASyD,kBAAkB3E,EAAUC,EAAMC,EAAMC,GAC7CC,SAAU,MAAO,WAKb,QAASC,KACL,GAAIC,GAAUC,GAAGC,OAAOC,MAAMC,KAAK,QACnCJ,GAAUA,EAAQK,MAAM,KACxBJ,GAAGK,UAAU,IAAMN,EAAQ,IAAIO,OAAO,IAAMP,EAAQ,IAC/CQ,aACIC,SAAS,KACTL,KAAK,SAAUM,GACfN,KAAK,QAASO,GAEvBV,GAAGC,OAAOC,MACTK,aACIC,SAAS,KACTL,KAAK,SAAUM,EAAaE,GAC5BR,KAAK,QAASO,EAAYC,GAmCnC,IAAI,GAnDAC,GAAOnB,EACPkB,EAAa,IAmBb0D,EAAgB,SAASvC,GAWrB,MAVAlD,OAAQ0F,KAAKC,MAAOzC,EAAI,IACxB0C,QAAUF,KAAKC,MAAMzC,EAAa,GAARlD,OAEvBA,MAAQ,KACPA,MAAQ,IAAMA,OAEf4F,QAAU,KACTA,QAAU,IAAMA,SAGb5F,MAAQ,IAAM4F,SAGzB3D,GAAUC,IAAK,GAAIC,MAAO,GAAIC,OAAQ,GAAIC,KAAM,IAChDC,EAAS,IACTT,EAAeS,EAASL,EAAOC,IAAMD,EAAOG,OAE5CO,EAAQ,IACRb,EAAca,EAAQV,EAAOI,KAAOJ,EAAOE,MAE3C0D,KAEAnC,EAAItC,GAAGuC,MAAMyB,SACZvB,QAAQ,EAAGzC,GAAGmB,IAAIP,KAClBqD,OAAO,EAAG1C,IAGXX,EAAOZ,GAAG0E,OAAOC,YAChBC,KAAKtC,EAAEW,MAAM,KAAKrC,GAEfmB,EAAI,EAAGA,EAAInB,EAAKiE,OAAQ9C,IAC5B0C,EAAQK,KAAKlE,EAAKmB,GAAG8C,OAGzB,IAAmB,GAAhB7E,GAAGmB,IAAIP,GACN,GAAIQ,GAAOF,EAASlB,GAAGmB,IAAIsD,OAE3B,IAAIrD,GAAO,CAGf,IAAI2C,GAAI/D,GAAGuC,MAAMyB,SACZvB,QAAQ,EAAGzC,GAAGmB,IAAIP,EAAM,SAASkB,GAAK,MAAOA,GAAEiC,MAC/CE,OAAO/C,EAAQ,IAEhBO,EAAQzB,GAAGC,OAAO,IAAMP,GACvBS,KAAK,UAAW,OAASO,EAAc,IAAMD,GAC7CN,KAAK,QAASO,GACdP,KAAK,SAAUM,GACfN,KAAK,sBAAuB,YAC5BuB,GAAG,QAAS5B,EAEjB2B,GAAMI,OAAO,KACRA,OAAO,QACP1B,KAAK,QAAS,SACdA,KAAK,YAAa,WACf,MAAO,cAAgBoB,EAAQ,UAElCc,KAAKzC,EAEV,IAyCImF,GAzCApD,EAAMF,EAAMpB,UAAU,QACrBO,KAAKA,GACPgB,QAAQC,OAAO,KACb1B,KAAK,QAAS,OACdA,KAAK,YAAa,SAAS2B,GAAK,MAAO,eAAiBQ,EAAER,EAAEQ,KAAMzB,EAAOI,MAAQ,MAAQ8C,EAAEjC,EAAEiC,KAAMlD,EAAOC,KAAO,MACjHY,GAAG,aAAc,SAASI,GAIvB,IAHAC,EAAI,EACJE,KAAOH,EAAE+C,OAEF5C,MAAQ,GACXA,MAAc,GACdF,GAEJ,IAAIG,GAAY,EAAJH,EAAS,EACrB/B,IAAGC,OAAOD,GAAGmC,MAAMC,KAAK,IAAInC,OAAO,aAC9BA,OAAO,QACHE,KAAK,YAAa,eAAiBU,EAAOI,KAAO,GAAK,MAAQC,EAAUY,EAAE+C,OAASzD,IAASP,EAAOC,IAAM,IAAM,MAC/GX,KAAK,aAAc,WACnBkC,KAAKP,EAAE+C,QAEhB7E,GAAGC,OAAOD,GAAGmC,MAAMC,KAAK,IAAInC,OAAO,aAC9BE,KAAK,QAAS+B,EAAO,MACrB/B,KAAK,SAAU,QACfF,OAAO,QACHE,KAAK,YAAa,gBAAmBU,EAAOI,KAAQiB,GAAQ,MAAQhB,EAAUY,EAAE+C,OAASzD,IAASP,EAAOC,KAAO,MAChHX,KAAK,QAAS+B,EAAO,MACrB/B,KAAK,SAAU,QACfA,KAAK,OAAO,aAExBuB,GAAG,aAAc,WACd1B,GAAGC,OAAOD,GAAGmC,MAAMC,KAAK,IAAInC,OAAO,aAC9BA,OAAO,QACHE,KAAK,aAAc,UAE5BH,GAAGC,OAAOD,GAAGmC,MAAMC,KAAK,IAAInC,OAAO,aAC9BA,OAAO,QACHE,KAAK,QAAS,KACdA,KAAK,SAAU,KACfA,KAAK,OAAO,KAKzB4E,GADUC,QAAXpE,EAAK,GACI,EAEA0B,EAAE1B,EAAK,GAAGqE,IAGtBtD,EAAIE,OAAO,QACN1B,KAAK,IAAK,GACVA,KAAK,QAAS4E,EAAQ,GACtB5E,KAAK,SAAU,SAAS2B,GAAK,MAAOZ,GAAS6C,EAAEjC,EAAEiC,IAEtD,IAAIpB,GAAQ3C,GAAG4C,IAAIC,OACdN,MAAMD,GACNY,OAAO,UACPH,WAAWsB,EAEhB5C,GAAMI,OAAO,KACR1B,KAAK,QAAS,UACdA,KAAK,KAAM,KAAOT,GAClBS,KAAK,YAAa,cAAgBU,EAAOI,KAAO,MAAQC,IAAUL,EAAOC,KAAO,KAChFwC,KAAKX,GAEVlB,EAAMI,OAAO,KACRA,OAAO,QACH1B,KAAK,QAAS,YACdA,KAAK,YAAa,WACf,GAAI0C,GAAO7C,GAAGC,OAAO,MAAQP,GAAM8D,OAC/BE,GAAY7C,EAAOI,KAAQ4B,EAAKc,wBAAwBpC,MAAM,EAAK,GACnEqC,GAAW/C,EAAOC,IAAMI,EAAS2B,EAAKc,wBAAwBzC,OAAS,GACvE2C,EAAQ,aAAeH,EAAW,IAAME,EAAU,GAEtD,OAAOC,KAEVxB,KAAK,iBAEd,IAAI6B,GAAQlE,GAAG4C,IAAIC,OACdN,MAAMwB,GACNb,OAAO,OAEZzB,GAAMI,OAAO,KACR1B,KAAK,QAAS,UACdA,KAAK,KAAO,KAAOT,GACnBS,KAAK,YAAa,cAAgBU,EAAOI,KAAO,IAAMJ,EAAOC,IAAM,KACnEwC,KAAKY,GAEVzC,EAAMI,OAAO,KACRA,OAAO,QACH1B,KAAK,QAAS,YACdA,KAAK,YAAa,WACf,GAAI0C,GAAO7C,GAAGC,OAAO,MAAQP,GAAM8D,OAC/BE,GAAY7C,EAAOI,KAAO4B,EAAKc,wBAAwBpC,MAAQ,EAC/DqC,GAAW/C,EAAOC,IAAO+B,EAAKc,wBAAwBzC,OAAO,EAAK,GAClE2C,EAAQ,aAAeH,EAAW,IAAME,EAAU,cAEtD,OAAOC,KAEVxB,KAAK,kBAEdZ,EAAMI,OAAO,KACR1B,KAAK,QAAS,YACd0B,OAAO,QACZJ,EAAMxB,OAAO,aACR4B,OAAO,UAjZpBqD,WAAW9F,QAAS"} \ No newline at end of file +{"version":3,"file":"run_stats.js","sources":["../../src/reports_webapp/run_stats.js"],"names":["date_by_subtracting_days","date","days","Date","getFullYear","getMonth","getDate","getHours","getMinutes","getSeconds","getMilliseconds","date_by_adding_hours","hours","get_utc_time","getUTCFullYear","getUTCMonth","getUTCDate","getUTCHours","getUTCMinutes","getUTCSeconds","refresh","window","location","reload","create_chart","inp_data","name","time","title","require","click","classes","d3","select","this","attr","split","selectAll","filter","transition","duration","chart_height","chart_width","chart_zoom","data","margin","top","right","bottom","left","height","max","zoom","$","css","width","barWidth","chart","on","bar","enter","append","d","i","curr_margin","size","wdth","event","path","text","x","scale","utc","domain","rangeRound","xAxis","svg","axis","tickPadding","tickFormat","format","ticks","orient","tickSize","outerTickSize","nice","call","style","node","getBBox","left_pad","getBoundingClientRect","top_pad","trans","info","y","linear","range","yAxis","round","create_histogram","formatMinutes","Math","floor","minutes","lengths","layout","histogram","bins","length","push","bar_x","undefined","dx","setTimeout"],"mappings":"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"} \ No newline at end of file diff --git a/static/scripts/reports_webapp/run_stats.js b/static/scripts/reports_webapp/run_stats.js index dbf1f551b0a..f72205d4235 100644 --- a/static/scripts/reports_webapp/run_stats.js +++ b/static/scripts/reports_webapp/run_stats.js @@ -1,2 +1,2 @@ -function date_by_subtracting_days(a,b){return new Date(a.getFullYear(),a.getMonth(),a.getDate()-b,a.getHours(),a.getMinutes(),a.getSeconds(),a.getMilliseconds())}function date_by_adding_hours(a,b){return new Date(a.getFullYear(),a.getMonth(),a.getDate(),a.getHours()+b,a.getMinutes(),a.getSeconds(),a.getMilliseconds())}function get_utc_time(){var a=new Date;return new Date(a.getUTCFullYear(),a.getUTCMonth(),a.getUTCDate(),a.getUTCHours(),a.getUTCMinutes(),a.getUTCSeconds())}function refresh(){window.location.reload(!0)}function create_chart(a,b,c,d){require(["d3"],function(){function e(){var a=d3.select(this).attr("class");a=a.split(" "),d3.selectAll("."+a[0]).filter("."+a[1]).transition().duration(750).attr("height",k).attr("width",n),d3.select(this).transition().duration(750).attr("height",k*h).attr("width",n*h)}var f=a,g={top:60,right:30,bottom:50,left:60},h=1.8,i=150;if(0!=d3.max(f))var j=i/d3.max(f);else var j=1;var k=i+g.top+g.bottom;$(".charts").css("height",k*h);var l=300,m=0;"hours"==c?m=l/24:"days"==c&&(m=l/30);var n=l+g.left+g.right,o=d3.select("#"+b).attr("width",n).attr("height",n).attr("preserveAspectRatio","xMidYMin").attr("viewBox","0 0 "+n+" "+k).on("click",e),p=o.selectAll("g").data(f).enter().append("g").attr("transform",function(a,b){return curr_margin=+g.left,curr_margin+=+(b*m),"translate("+curr_margin+","+g.top+")"}).on("mouseenter",function(a){for(var b=0,c=a;c>=1;)c/=10,b++;var d=4*b+10;d3.select(d3.event.path[1]).select(".tool_tip").select("text").attr("transform","translate( "+(g.left-5)+", "+(i-a*j+ +g.top+10)+" )").attr("visibility","visible").text(a),d3.select(d3.event.path[1]).select(".tool_tip").attr("width",d+"px").attr("height","15px").select("rect").attr("transform","translate( "+(+g.left-d)+", "+(i-a*j+ +g.top)+" )").attr("width",d+"px").attr("height","15px").attr("fill","#ebd9b2")}).on("mouseleave",function(a){d3.select(d3.event.path[1]).select(".tool_tip").select("text").attr("visibility","hidden"),d3.select(d3.event.path[1]).select(".tool_tip").select("rect").attr("width","0").attr("height","0").attr("fill","").text(a)});if(o.append("g").append("text").attr("class","title").attr("text-anchor","end").attr("transform",function(){return"translate( "+l+",15 )"}).text(d),"hours"==c)var q=d3.time.scale.utc().domain([get_utc_time(),date_by_subtracting_days(get_utc_time(),1)]).rangeRound([0,l]),r=d3.svg.axis().scale(q).tickPadding(0).tickFormat(d3.time.format("%b %d %H")).ticks(d3.time.hours,1).orient("bottom").tickSize(0).outerTickSize(0);else if("days"==c)var q=d3.time.scale.utc().domain([get_utc_time(),date_by_subtracting_days(get_utc_time(),28)]).rangeRound([0,l]).nice(),r=d3.svg.axis().scale(q).tickPadding(0).tickFormat(d3.time.format("%b %d")).ticks(d3.time.days,1).orient("bottom").tickSize(0).outerTickSize(0);o.append("g").attr("class","x axis").attr("id","x_"+b).attr("transform","translate( "+ +g.left+","+(+i+ +g.top)+")").call(r).selectAll("text").style("text-anchor","end").attr("transform",function(){return"rotate(-60, 0, "+d3.select(this).node().getBBox().height+")"}),o.append("g").append("text").attr("class","ax_title").attr("transform",function(){var a=d3.select("#x_"+b).node(),c=+g.left+a.getBoundingClientRect().width/2+30,d=+g.top+i+a.getBoundingClientRect().height+10,e="translate("+c+","+d+")";return e}).text(function(){var a="";return"hours"==c?a="Date(month day hour)":"days"==c&&(a="Date(month day)"),a});var s=d3.scale.linear().range([i,0]),t=d3.svg.axis().scale(s).orient("left").tickFormat(function(a){return d3.round(a*d3.max(f),0)});o.append("g").attr("class","y axis").attr("id","y_"+b).attr("text-anchor","end").attr("transform","translate( "+g.left+","+g.top+")").call(t).select(".domain"),o.append("g").append("text").attr("class","ax_title").attr("transform",function(){var a=d3.select("#y_"+b).node(),c=+g.left-a.getBoundingClientRect().width-5,d=+g.top+a.getBoundingClientRect().height/2-30,e="translate("+c+","+d+")rotate(-90)";return e}).text("Number of Jobs"),p.append("rect").attr("y",function(a){return i-a*j}).attr("height",function(a){return a*j}).attr("width",m-1),o.append("g").attr("class","tool_tip").append("rect"),o.select(".tool_tip").append("text"),("jc_dy_chart"==b||"jc_hr_chart"==b)&&d3.select("#"+b).attr("height",k*h).attr("width",n*h)})}function create_histogram(a,b,c,d){require(["d3"],function(){function c(){var a=d3.select(this).attr("class");a=a.split(" "),d3.selectAll("."+a[0]).filter("."+a[1]).transition().duration(750).attr("height",j).attr("width",l),d3.select(this).transition().duration(750).attr("height",j*f).attr("width",l*f)}for(var e=a,f=1.8,g=function(a){return hours=Math.floor(a/60),minutes=Math.floor(a-60*hours),hours<10&&(hours="0"+hours),minutes<10&&(minutes="0"+minutes),hours+":"+minutes},h={top:60,right:30,bottom:50,left:60},i=150,j=i+h.top+h.bottom,k=300,l=k+h.left+h.right,m=[],n=d3.scale.linear().domain([0,d3.max(e)]).range([0,k]),e=d3.layout.histogram().bins(n.ticks(20))(e),o=0;o=1;)size/=10,o++;var b=4*o+10;d3.select(d3.event.path[1]).select(".tool_tip").select("text").attr("transform","translate( "+(h.left-5)+", "+(i-a.length*p+ +h.top+10)+" )").attr("visibility","visible").text(a.length),d3.select(d3.event.path[1]).select(".tool_tip").attr("width",b+"px").attr("height","15px").select("rect").attr("transform","translate( "+(+h.left-b)+", "+(i-a.length*p+ +h.top)+" )").attr("width",b+"px").attr("height","15px").attr("fill","#ebd9b2")}).on("mouseleave",function(){d3.select(d3.event.path[1]).select(".tool_tip").select("text").attr("visibility","hidden"),d3.select(d3.event.path[1]).select(".tool_tip").select("rect").attr("width","0").attr("height","0").attr("fill","")});s=void 0==e[0]?1:n(e[0].dx),t.append("rect").attr("x",1).attr("width",s-1).attr("height",function(a){return i-q(a.y)});var u=d3.svg.axis().scale(n).orient("bottom").tickFormat(g);r.append("g").attr("class","x axis").attr("id","x_"+b).attr("transform","translate( "+h.left+","+(+i+ +h.top)+")").call(u),r.append("g").append("text").attr("class","ax_title").attr("transform",function(){var a=d3.select("#x_"+b).node(),c=+h.left+a.getBoundingClientRect().width/2+30,d=+h.top+i+a.getBoundingClientRect().height+10,e="translate("+c+","+d+")";return e}).text("ETA - hrs:mins");var v=d3.svg.axis().scale(q).orient("left");r.append("g").attr("class","y axis").attr("id","y_"+b).attr("transform","translate( "+h.left+","+h.top+")").call(v),r.append("g").append("text").attr("class","ax_title").attr("transform",function(){var a=d3.select("#y_"+b).node(),c=+h.left-a.getBoundingClientRect().width-5,d=+h.top+a.getBoundingClientRect().height/2-30,e="translate("+c+","+d+")rotate(-90)";return e}).text("Number of Jobs"),r.append("g").attr("class","tool_tip").append("rect"),r.select(".tool_tip").append("text")})}setTimeout(refresh,9e5); +function date_by_subtracting_days(a,b){return new Date(a.getFullYear(),a.getMonth(),a.getDate()-b,a.getHours(),a.getMinutes(),a.getSeconds(),a.getMilliseconds())}function date_by_adding_hours(a,b){return new Date(a.getFullYear(),a.getMonth(),a.getDate(),a.getHours()+b,a.getMinutes(),a.getSeconds(),a.getMilliseconds())}function get_utc_time(){var a=new Date;return new Date(a.getUTCFullYear(),a.getUTCMonth(),a.getUTCDate(),a.getUTCHours(),a.getUTCMinutes(),a.getUTCSeconds())}function refresh(){window.location.reload(!0)}function create_chart(a,b,c,d){require(["d3"],function(){function e(){var a=d3.select(this).attr("class");a=a.split(" "),d3.selectAll("."+a[0]).filter("."+a[1]).transition().duration(750).attr("height",k).attr("width",n),d3.select(this).transition().duration(750).attr("height",k*h).attr("width",n*h)}var f=a,g={top:60,right:30,bottom:50,left:60},h=1.75,i=150;if(0!=d3.max(f))var j=i/d3.max(f);else var j=1;var k=i+g.top+g.bottom;$(".charts").css("height",k*h);var l=300,m=0;"hours"==c?m=l/24:"days"==c&&(m=l/30);var n=l+g.left+g.right,o=d3.select("#"+b).attr("width",n).attr("height",n).attr("preserveAspectRatio","xMidYMin").attr("viewBox","0 0 "+n+" "+k).on("click",e),p=o.selectAll("g").data(f).enter().append("g").attr("transform",function(a,b){return curr_margin=+g.left,curr_margin+=+(b*m),"translate("+curr_margin+","+g.top+")"}).on("mouseenter",function(a){for(var b=0,c=a;c>=1;)c/=10,b++;var d=4*b+10;d3.select(d3.event.path[1]).select(".tool_tip").select("text").attr("transform","translate( "+(g.left-5)+", "+(i-a*j+ +g.top+10)+" )").attr("visibility","visible").text(a),d3.select(d3.event.path[1]).select(".tool_tip").attr("width",d+"px").attr("height","15px").select("rect").attr("transform","translate( "+(+g.left-d)+", "+(i-a*j+ +g.top)+" )").attr("width",d+"px").attr("height","15px").attr("fill","#ebd9b2")}).on("mouseleave",function(a){d3.select(d3.event.path[1]).select(".tool_tip").select("text").attr("visibility","hidden"),d3.select(d3.event.path[1]).select(".tool_tip").select("rect").attr("width","0").attr("height","0").attr("fill","").text(a)});if(o.append("g").append("text").attr("class","title").attr("text-anchor","end").attr("transform",function(){return"translate( "+l+",15 )"}).text(d),"hours"==c)var q=d3.time.scale.utc().domain([get_utc_time(),date_by_subtracting_days(get_utc_time(),1)]).rangeRound([0,l]),r=d3.svg.axis().scale(q).tickPadding(0).tickFormat(d3.time.format("%b %d %H")).ticks(d3.time.hours,1).orient("bottom").tickSize(0).outerTickSize(0);else if("days"==c)var q=d3.time.scale.utc().domain([get_utc_time(),date_by_subtracting_days(get_utc_time(),28)]).rangeRound([0,l]).nice(),r=d3.svg.axis().scale(q).tickPadding(0).tickFormat(d3.time.format("%b %d")).ticks(d3.time.days,1).orient("bottom").tickSize(0).outerTickSize(0);o.append("g").attr("class","x axis").attr("id","x_"+b).attr("transform","translate( "+ +g.left+","+(+i+ +g.top)+")").call(r).selectAll("text").style("text-anchor","end").attr("transform",function(){return"rotate(-60, 0, "+d3.select(this).node().getBBox().height+")"}),o.append("g").append("text").attr("class","ax_title").attr("transform",function(){var a=d3.select("#x_"+b).node(),c=+g.left+a.getBoundingClientRect().width/2+30,d=+g.top+i+a.getBoundingClientRect().height+10,e="translate("+c+","+d+")";return e}).text(function(){var a="";return"hours"==c?a="Date(month day hour)":"days"==c&&(a="Date(month day)"),a});var s=d3.scale.linear().range([i,0]),t=d3.svg.axis().scale(s).orient("left").tickFormat(function(a){return d3.round(a*d3.max(f),0)});o.append("g").attr("class","y axis").attr("id","y_"+b).attr("text-anchor","end").attr("transform","translate( "+g.left+","+g.top+")").call(t).select(".domain"),o.append("g").append("text").attr("class","ax_title").attr("transform",function(){var a=d3.select("#y_"+b).node(),c=+g.left-a.getBoundingClientRect().width-5,d=+g.top+a.getBoundingClientRect().height/2-30,e="translate("+c+","+d+")rotate(-90)";return e}).text("Number of Jobs"),p.append("rect").attr("y",function(a){return i-a*j}).attr("height",function(a){return a*j}).attr("width",m-1),o.append("g").attr("class","tool_tip").append("rect"),o.select(".tool_tip").append("text"),("jc_dy_chart"==b||"jc_hr_chart"==b)&&d3.select("#"+b).attr("height",k*h).attr("width",n*h)})}function create_histogram(a,b,c,d){require(["d3"],function(){function c(){var a=d3.select(this).attr("class");a=a.split(" "),d3.selectAll("."+a[0]).filter("."+a[1]).transition().duration(750).attr("height",j).attr("width",l),d3.select(this).transition().duration(750).attr("height",j*f).attr("width",l*f)}for(var e=a,f=1.75,g=function(a){return hours=Math.floor(a/60),minutes=Math.floor(a-60*hours),hours<10&&(hours="0"+hours),minutes<10&&(minutes="0"+minutes),hours+":"+minutes},h={top:60,right:30,bottom:50,left:60},i=150,j=i+h.top+h.bottom,k=300,l=k+h.left+h.right,m=[],n=d3.scale.linear().domain([0,d3.max(e)]).range([0,k]),e=d3.layout.histogram().bins(n.ticks(20))(e),o=0;o=1;)size/=10,o++;var b=4*o+10;d3.select(d3.event.path[1]).select(".tool_tip").select("text").attr("transform","translate( "+(h.left-5)+", "+(i-a.length*p+ +h.top+10)+" )").attr("visibility","visible").text(a.length),d3.select(d3.event.path[1]).select(".tool_tip").attr("width",b+"px").attr("height","15px").select("rect").attr("transform","translate( "+(+h.left-b)+", "+(i-a.length*p+ +h.top)+" )").attr("width",b+"px").attr("height","15px").attr("fill","#ebd9b2")}).on("mouseleave",function(){d3.select(d3.event.path[1]).select(".tool_tip").select("text").attr("visibility","hidden"),d3.select(d3.event.path[1]).select(".tool_tip").select("rect").attr("width","0").attr("height","0").attr("fill","")});s=void 0==e[0]?1:n(e[0].dx),t.append("rect").attr("x",1).attr("width",s-1).attr("height",function(a){return i-q(a.y)});var u=d3.svg.axis().scale(n).orient("bottom").tickFormat(g);r.append("g").attr("class","x axis").attr("id","x_"+b).attr("transform","translate( "+h.left+","+(+i+ +h.top)+")").call(u),r.append("g").append("text").attr("class","ax_title").attr("transform",function(){var a=d3.select("#x_"+b).node(),c=+h.left+a.getBoundingClientRect().width/2+30,d=+h.top+i+a.getBoundingClientRect().height+10,e="translate("+c+","+d+")";return e}).text("ETA - hrs:mins");var v=d3.svg.axis().scale(q).orient("left");r.append("g").attr("class","y axis").attr("id","y_"+b).attr("transform","translate( "+h.left+","+h.top+")").call(v),r.append("g").append("text").attr("class","ax_title").attr("transform",function(){var a=d3.select("#y_"+b).node(),c=+h.left-a.getBoundingClientRect().width-5,d=+h.top+a.getBoundingClientRect().height/2-30,e="translate("+c+","+d+")rotate(-90)";return e}).text("Number of Jobs"),r.append("g").attr("class","tool_tip").append("rect"),r.select(".tool_tip").append("text")})}setTimeout(refresh,9e5); //# sourceMappingURL=../../maps/reports_webapp/run_stats.js.map \ No newline at end of file diff --git a/templates/webapps/reports/run_stats.mako b/templates/webapps/reports/run_stats.mako index db9f277f9cf..1572e0747e2 100644 --- a/templates/webapps/reports/run_stats.mako +++ b/templates/webapps/reports/run_stats.mako @@ -16,7 +16,7 @@ create_chart( ${jc_hr_data}, "jc_hr_chart", "hours", "Jobs Created per Hour" ); create_chart( ${jc_dy_data}, "jc_dy_chart", "days", "Jobs Created per Day" ); create_histogram( ${et_hr_data}, "et_hr_chart", "delta-hours", "Job Run Times (past day)" ); - create_histogram( ${et_dy_data}, "et_dy_chart", "days", "Job Run Time (past 3 days)" ); + create_histogram( ${et_dy_data}, "et_dy_chart", "days", "Job Run Time (past 30 days)" ); });