From 38f94bbaddd84a358e2d59526020776bff1dd5a3 Mon Sep 17 00:00:00 2001 From: Camilo Ramirez Gomez Date: Tue, 17 Sep 2019 18:50:34 +0200 Subject: [PATCH] Text edits, README.md update and bug fixes --- README.md | 8 ++++++-- dashboard/Data/Electricity_demand.xlsx | Bin 9625 -> 9620 bytes dashboard/app.py | 8 ++++---- requirements.txt | 1 - 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 76c27de..bdcf9d1 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,11 @@ A companion dashboard to visualize the results from the OSeMOSYS model is provid ### Installation instructions: 1. You should have installed a distribution of python 3.x in your computer. -2. If you are using the Anaconda distribution of Python, install all python packages required listed in the `requirements.txt` file using the `conda install -c conda-forge --file requirements.txt` command in your computer bash or anaconda prompt. Alternatively, you can create a virtual environment using venv and install all required packages there using pip: +2. If you are using the Anaconda distribution of Python, install all python packages required listed in the `requirements.txt` +file using the `conda install -c conda-forge --file requirements.txt` command in your computer bash or anaconda prompt. +You can also create an environment with `conda create -n -c conda-forge --file requirements.txt`, +and activate it with `conda activate `. + Alternatively, you can create a virtual environment using venv and install all required packages there using pip: ``` cd pip install virtualenv @@ -35,6 +39,6 @@ source venv/Scripts/activate pip install -r requirements.txt ``` ### Running the dashboard: -After installing all required packages, the dashboard can be run locally by running `python app.py` in your bash or anaconda prompt. A local host URL will be displayed as: http://127.0.0.1:8050/ copy it and paste it in your browser. +After installing all required packages, the dashboard can be run locally by running `dashboard/python app.py` in your bash or anaconda prompt. A local host URL will be displayed as: http://127.0.0.1:8050/ copy it and paste it in your browser. To exit the app, type CTRL + C a couple of times in your bash. diff --git a/dashboard/Data/Electricity_demand.xlsx b/dashboard/Data/Electricity_demand.xlsx index 8370568f232196083e614c4c01bc6ec940065bac..c43324f532adeef57003926d14c607dda7b24a8f 100644 GIT binary patch delta 2020 zcmVEl+Z;o5Oz-9k^~IUj&&^2kL`l>QV?jvNG#Mz#Q|@0?55y>fa&8Adf9ney?~M~p^B ze~u6x0v|r(z>_raR1jtNRh(Agc3Zjbh3BZib0%`2$>vKHrsM-lIP5VeJr zf-pI7p$xfLGfE|1jDc0FJur{PogPWhnku7UC&3(t|IoHU+AL^K6bRG;Q981)5`xn$ zexE1HtcN{fhWHWZou%uaFk-MrqqJ=MPtK*OvPr4w2Zmo-e??y^zqMB8VRgHk>=xNv zTxuMJ`4Z04hia9_$=$mAU)r|V+?~qF3GMd8ICgSyjW*iSYDZbNB@eSd`%b$OmABB8Y zd&YDC7HYK!_gXizI9BioIs*#Kqtx{FS$!Ii*E6VH8TA0bt z*bv(-&siq&L&a)sjYw8f4e_fzZ`9dZm4C)uMdkCM`I3vO0TUZua{bmC4TCD5J??5D z>81qUuVhT~v+eff!hFSZDU{gi2+YMc&`ZvD@m&m-mh*xG1C#bZvh5=LMt^4CNgBq> zd7GfWIXf!nf1v5+iIptZtbjU&!4Dy-r<|JD2)S|Ie=`{`PhU-yHbOibbB~}n0>`Q~ zV;s|5^B1;aCBQQRrC0y9v6%l5NZdu@{y#_c&{p<$85C?w52gM?9DiYax7Xl$96>~F zmS)9U##9cq0_RbBW9;Ul1b-v&8&uph9psw6w$CFk^nMX0@F_niEvkR)2Xa!g3du}9IX-E^^Q<|II+q)!^aD4{KXeblwM>)S z&-#yTuG&ImRMX{LiemsP1sth{nsrBJrgHzEY{;?!e>3Ps2&^GQ1%EB@vb>$gFHqI| zgt)&%Onk)3B7lEqW9lQaO9Z*`A?r&>I`$zC7GfL41pkOXe0M&?kd7`V&<_K0V$jfP z4j+P(VjkcD`JP|z#4NiZQ-mJme9 z6_Or8&^-eP8T1uG7JuRrN>SUo4U74>GJ^Vj?FoDMz=9sY$Dpt9u@ILJS{^Gvblr&g zxUv*4Jy+OQpUEIT27QH(g}8iBSSvvE@^NJ;u8%A1;{*HbfchA;&nHRHHfbR)AGEGl zfOy|6kT7$FDcVZbo@P(OncLXsw|#>~git%(TZl_2!5cq7-hUaPRiC-S1h<^0*~92= z5F>-W!pK5AMrdDO0i>UiD@>8*+SBY|)Lx_poXzImb%j%FvOV;>xD$L58B9MbPnzPx z$k*-TWzO9JyzDXU9fG*~h{brt!UvMUe89`w`!9HTx_!Kc-5bc|#UVwj;{Js3yyNSX zcL6~AOlAypq<>Q+U3=2Ly$^CsTHpH~NYXCBk83XSfjHGK%dO^!h zBlZ&9&>j1g${nv&P_k`1Tfp`y?f5Z@%vLHIGjZI)v9}Q#Mv3#=9%fJm_ez*X!eA?e zKEJ?ZV(dOKeQ1J)HcUS8A243QnirD81k(93}yOUrWO<6vf{KzeCA;n`CqULfe7Lo)iQtif9R2BVzb!DwHL=%D{(4v;5-eu^m*u+Z|InTA^RjnaIM{sDJ z-`=FcFi~50v9$r~OK?#jX~%@g(B6B)Fm_@Oin}B@bP%_-RosVv((bU~;*0M9PY9V~ z1)fXpIc|Zm8HnhFlwv@dZ(DT$DKJ!^KzoO2Lh+y1gH`V8gH9PaRq2l=>~xAdW=qkF zgZtph!PqoS(oDM;AwR_*&rh%2s&T2?TM0mUDg_f3xUX%V;&BlUS8?Z`!;QBk$opf^ zuk@to;`R`bQ3$|2`nYH1efscNY*0QSbQY6&OlAdLGP++g0F$8u6tgHFL<9+|eb)890RR9flXW9g0{sk=9StRu z?;|P#{|%EL4i%FyBq{;JlUpPp8@%2yArk}u09OwH02lxO00000000000000|la?ea z8*Gj5pF;rv08s(}01*HH00000000000001+liVae0Tq)QB~$^LlW-*?23R5h0001& C5x|Q8 delta 2014 zcmV<42O;>BOPNcs8w-DGc|g&^0RR9j1pojP0001ZY%g||e+NRh1`vuTt6b(EbMA>~6r&YM$SFU^MIXdv15jmmB?n4!(>DV!YX61GT&Eukq9<~eI z5nZ19485AF%8GyZJ}W*I)B4AxID~2PIV_WGHw6o*wUEJk{a*D7?{hHget~uYQU9N<0Gr-yR=9s@-@Dr1v0~E6h4OI&XA-g%c6$AhPOOt6B zB7bk|HVl3ru>WBA{lt--=7uB(r%8(S02_vNmuJOR5}~%`$x73nUq4F9MWW{>eu-oA zBgK!TC~Efgy~u+%CTlLrc}RNwFkodWGG6ZH;a`6~eHn*At!SCiT$F4cey}?Hy7>90 z*-^;Xde4{&z(QHi!@W|~G>YnU&k9=iM1RFfkZgr4sDf9yi|R@;ni-`ckK%rR7!{P4 zp|voT_t+5IEl=4>q=$l)${LX@rwaV9_q?jl){68Va|M;Jhw4iziV93@c+S;_F&YL% zI(^=iLefnRyx+-yrf1vcrD49{sT8%?svek&tfNiNlV}owrNu1cz(9vRkZd~-zkiYG zcantBVrByLH)qG%`5!2{d0{zA70Vz`VemtU;w7cpH$onq_uq8H^V3(IrHv4;+T1fJ z_F>`Ln9&Qb>G*F^`hrtju?7c_ZpcJ*r@*>V2G>+f79rB2uvaJHGic2Z84ff zZ;;9Kgm`QshCX6x5y1IkW9%bVO$2%HA?qe2K~|nD#1@Bk{uzJx?tF+K9G95rqP;&R z8V%*;@F6%T76Qv%C==xE($$}!c(}5-k0RkMJh%uwLXfZygf#jFAq(*cA*Yvakzhiu zERGQ&S4dh2LG^SXq|rABS$~L2C_!cG7A)rD$_T3WwI^)h0~@*nAC11j$3k2_*Okpy zUIOA$jhK%siwVk)D{RZpuoEARzQM;rTt28HECJEV$Cbq>v1?b@#s~Urhx}-?&nHIF zf3y&n58BsDKwP^860TffjC-S}*-~(N0=vJ(X*42)TbzZsgkszg0Dp32gsN)g3S-n9 z*Pdnzqe&-58hwM2g?KFiIlTl(J0n+^;I8dywlLDiahJ1M!*6ghCe5LL@jF5Ncd0S$ ztUPIg%6jeVw(-*EZikt}9@E|-*qAyj#!D7%;KVzwaQ%7GCNEF7jaRq1!OX^fz7n*R zA5R!>bv#aa0{}{<8Gpd9sm4c>Hh)cZ8?A2B1Kc-o877T%HRp#$6?$U;%H>Kga&bIv z(E42F5UeP^h2(B4 zwrNPB-Tu94yVVYckeA$Z?srcv$ySG^4t~Jcs#Q6n5kUbc(aK8ga`aZN!zBu=<4W?n zRgj}2ShOl`Z!)2oXbrrWR)cXB*uayNWkTm@@0?~BTd{|R+sHeV7q_ixxPS9kv%{K; zFTMjD6O!Tv9GBd2+yg^B5zz@L#e~$~rXB!NV5p%1R`JiiW44J*~}N&qS{DVQ+8U2BRA&o6#)HMef# zcf74YJ{-M%r6$D?cZ7fpd^`X)#yuUSGMnz2MA|z=@7A0LWddFh&*^j*F?*om6 z<}~!T|sPER%2} zQvv}ElNk*qlj9b$CFkhAR8gOIl2`D002u5000;O000000000000000 wR+Et=D+Ry~Mj}F!!6X#{p_A7nJ^~salQADDlRzaZ0iTm=B_jr1A^-pY01~{m@&Et; diff --git a/dashboard/app.py b/dashboard/app.py index c8ad833..467506b 100644 --- a/dashboard/app.py +++ b/dashboard/app.py @@ -381,14 +381,14 @@ def get_general_graph(df, year_slider, variable, layout, title): ), html.Div( [ - html.P('SDG7.1 - Access to electricity', style={'text-align': 'center', 'font-size': '12px'}), + html.P('SDG7.1.1 - Access to electricity', style={'text-align': 'center', 'font-size': '12px'}), daq.BooleanSwitch(id='el-access-switch', on=False) ], className="mini_container", ), html.Div( [ - html.P('SDG7.1 - Access to clean cooking fuel', style={'text-align': 'center', 'font-size': '12px'}), + html.P('SDG7.1.2 - Access to clean cooking fuel', style={'text-align': 'center', 'font-size': '12px'}), daq.BooleanSwitch(id='clean-cooking-switch', on=False) ], className="mini_container", @@ -561,7 +561,7 @@ def get_general_graph(df, year_slider, variable, layout, title): [ html.Div( [ - html.H6('SDG7.3 - Access to electricity'), + html.H6('SDG7.1.1 - Access to electricity'), dcc.Graph( id='el_access_graph', ), @@ -584,7 +584,7 @@ def get_general_graph(df, year_slider, variable, layout, title): ), html.Div( [ - html.H6('SDG7.1 - Access to clean cooking fuel'), + html.H6('SDG7.1.2 - Access to clean cooking fuel'), dcc.Graph( id='cooking_graph', ), diff --git a/requirements.txt b/requirements.txt index ae7c604..3480af5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,6 +19,5 @@ python-dateutil==2.8.0 pytz==2019.2 retrying==1.3.3 six==1.12.0 -snakemake Werkzeug==0.15.6 xlrd==1.2.0