@@ -15,6 +15,7 @@ info: @echo "data - runs the 'collect.py' script to process the data" @echo "vizdata - copies the processed data to the viz directory" @echo + @echo "To run the visualization, 'cd viz ; pamela-web' (you need Pamela)" createdb: echo "create database $(MYSQL_DB) ; grant all privileges on $(MYSQL_DB).* to '$(MYSQL_USER)'@'$(HOSTNAME)';" | mysql -uroot -p ; true Makefile @@ -253,8 +253,6 @@ <div.footer <div.origin <div.out:[DEPARTMENT] - <div.more - <input.do-showMore(type=button,value=Show more...) <div.ExpenseTagDetails.details <div.body <div.departmentInfo viz/expenses.paml @@ -403,24 +403,6 @@ a:hover { vertical-align: middle; } -.ExpenseTag .footer .more { - display: none; - position: absolute; - left: -1px; - right: -1px; - bottom: -1px; - padding-top: 9px; - padding-bottom: 9px; - background: #E0E0E0; - font-weight: normal; - text-align: center; - z-index: 200; -} - -*:hover.ExpenseTag .footer .more { - display: block; -} - .ExpenseTagTooltip { min-width: 200px; background: #FFFFA0; viz/lib/css/visiblegovernment.css @@ -5,7 +5,7 @@ # License : BSD License # ----------------------------------------------------------------------------- # Creation : 07-Dec-2008 -# Last mod : 14-Jun-2009 +# Last mod : 29-Oct-2009 # ----------------------------------------------------------------------------- @module expensetag @@ -83,83 +83,9 @@ super bindUI () uis cursor = $ (".cursor", ui) uis canvas = $ ("canvas", ui) [0] - uis qtip = $ (uis canvas) qtip { - content: 'This is an active list element' - position: { - target:"mouse" - corner:{tooltip:"bottomMiddle"} - } - show: 'mouseover' - hide: 'mouseout' - content : {text:($ "#Templates .ExpenseTagTooltip" clone ())} - } qtip "api" - uis qtip onPositionUpdate = {e|updateToolTip (target, arguments)} - uis qtip onHide = {uis cursor addClass "hidden"} ctx = uis canvas getContext "2d" @end - @method updateToolTip - var pos = uis qtip getPos () - var w = parseInt ($ (uis qtip elements tooltip) css "width") - var ref = $ (uis canvas) offset () - pos left = pos left - ref left + w /2 - pos top = ref top - if pos left >= 0 - var width = parseInt ($(uis canvas) attr "width") - var height = parseInt ($(uis canvas) attr "height") - var start_mon = (parameters start year - 2003) * 12 + parameters start month - var end_mon = (parameters end year - 2003) * 12 + parameters end month - var range_mon = (start_mon)..(end_mon) - var x = 0 - var x_step = width / range_mon length - var month_offset = parseInt (pos left / x_step) - var m = start_mon + month_offset - var year = parameters start year + m / 12 - var month = m % 12 + 1 - if False - uis cursor css { - left: (m*x_step) - top: 0 - width: x_step - height:height - } - uis cursor removeClass "hidden" - end - if uis qtip lastMonth != m - var d = data mon [m] - var c = uis qtip elements content - $ ( ".month .out", c ) html (sprintf("%02d/%04d", month, year)) - if d is Undefined - $ (".when-data", c) addClass "hidden" - $ (".when-no_data", c) removeClass "hidden" - c addClass "nodata" - else - $ (".when-data", c) removeClass "hidden" - $ (".when-no_data", c) addClass "hidden" - c removeClass "nodata" - var expenses = retrieveExpenses (d) - var guidelines = retrieveGuidelines (d) - var delta = expenses / guidelines - if delta > 1.0 - delta = sprintf ("+%d%%", (delta * 100) - 100 ) - $ ( ".delta .out", c ) removeClass "negative" - $ ( ".delta .out", c ) addClass "positive" - else - delta = sprintf ("%d%%", (delta * 100) - 100 ) - $ ( ".delta .out", c ) addClass "negative" - $ ( ".delta .out", c ) removeClass "positive" - end - $ ( ".hospitality .out", c ) html ( sprintf ("%0.2f $", d hos) ) - $ ( ".travel .out", c ) html ( sprintf ("%0.2f $", d tra) ) - $ ( ".expenses .out", c ) html ( sprintf ("%0.2f $", expenses) ) - $ ( ".guidelines .out", c ) html ( sprintf ("%0.2f $", guidelines) ) - $ ( ".delta .out", c ) html ( delta ) - end - uis qtip lastMonth = m - end - end - @end - @method getMetrics data | Returns an object with various metrics on the data displayed by this visualization. var start_mon = (parameters start year - 2003) * 12 + parameters start month @@ -985,7 +911,7 @@ $(document) ready { var last_department = 0 # STEP 2 - We create widgets for each department in the EXPENSES dataset for department, i in EXPENSES - if i <= 2 + if i >= 0 # We build indicators #console log (department name) var name = department name @@ -1025,6 +951,7 @@ $(document) ready { # We create the visualization, and attach it to the view var viz = new ExpenseTag (new_view) viz parameters maxMonth = department max_month + # FIXME: Don't know if the total is OK viz parameters total = department total viz parameters globalMaxTotal = maxima_total viz parameters globalMaxMonth = maxima_month viz/lib/sjs/expensetag.sjs 0f97b673f7fe9694ff6245faf0048bf99336d93f Sebastien Pierre sebastien@type-z.org http://github.com/visiblegovernment/Expense-Visualizer/commit/5be64b8f73ba2e10c5c3c9b0d688f0bd9a73ba26 5be64b8f73ba2e10c5c3c9b0d688f0bd9a73ba26 2009-10-29T14:21:08-07:00 2009-10-29T14:21:08-07:00 Removed annoying, useless tooltip 09b51382f937bea80c9cf9fa67235d3d2354972f Sebastien Pierre sebastien@type-z.org