From 0f1862c54d1d8ab41bff8dd9dd987efef1b1d4a0 Mon Sep 17 00:00:00 2001 From: Simon Da Costa Date: Tue, 5 Jul 2022 16:55:45 +0200 Subject: [PATCH 1/4] Nouveau fichier source --- dashboard/data/BDD_for_dataviz.xlsx | Bin 0 -> 7005 bytes dashboard/layout/pages/details.py | 5 ++--- dashboard/utils.py | 4 +++- 3 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 dashboard/data/BDD_for_dataviz.xlsx diff --git a/dashboard/data/BDD_for_dataviz.xlsx b/dashboard/data/BDD_for_dataviz.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..349dc5da572a6d4e7b2282df9c7d33ab6a9f3c98 GIT binary patch literal 7005 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 literal 0 HcmV?d00001 diff --git a/dashboard/layout/pages/details.py b/dashboard/layout/pages/details.py index 95f4a2d..881296b 100644 --- a/dashboard/layout/pages/details.py +++ b/dashboard/layout/pages/details.py @@ -1,9 +1,8 @@ # from turtle import back # import pandas as pd from dash import dcc, html -from utils import t1b6_df +from utils import dataviz_df import plotly.express as px -# import plotly.graph_objs as go def get_company_details(df, selected_company): @@ -20,7 +19,7 @@ def get_company_details(df, selected_company): # Generate bar chart def details(selected_company): - df, amount, name, hover = get_company_details(t1b6_df, selected_company) + df, amount, name, hover = get_company_details(dataviz_df, selected_company) fig = px.bar( data_frame = df, x=[1, 1, 1, 1, 1, 1], diff --git a/dashboard/utils.py b/dashboard/utils.py index c831372..07fc9e7 100644 --- a/dashboard/utils.py +++ b/dashboard/utils.py @@ -50,6 +50,8 @@ def state_to_url(*state): t1b3_df = pd.read_csv('data/t1b3.csv') t1b4_df = pd.read_csv('data/t1b4.csv') t1b5_df = pd.read_csv('data/t1b5.csv') -t1b6_df = pd.read_csv('data/t1b6.csv', sep=';') +# t1b6_df = pd.read_csv('data/t1b6.csv', sep=';') t1b7_df = pd.read_csv('data/t1b1-7.csv') t2b2_df = pd.read_csv('data/t2b2.csv') + +dataviz_df = pd.read_excel('data/BDD_for_dataviz.xlsx', sheet_name='Sheet1') \ No newline at end of file From fc7eb49978aafc302bbff7e61d4196ab20e919e1 Mon Sep 17 00:00:00 2001 From: Simon Da Costa Date: Tue, 5 Jul 2022 17:41:29 +0200 Subject: [PATCH 2/4] Branchement sur nouveau fichier source --- dashboard/components/navbar.py | 4 ++-- dashboard/layout/pages/action_suivi.py | 2 +- dashboard/layout/pages/action_suivi_global.py | 4 ++-- dashboard/layout/pages/engagements.py | 14 ++++++------ dashboard/layout/pages/infos.py | 22 +++++++++---------- dashboard/layout/pages/reduction_rate.py | 6 ++--- dashboard/layout/pages/sector_compare.py | 4 ++-- dashboard/utils.py | 12 +++++----- 8 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dashboard/components/navbar.py b/dashboard/components/navbar.py index 4d00210..507a406 100644 --- a/dashboard/components/navbar.py +++ b/dashboard/components/navbar.py @@ -4,7 +4,7 @@ from dash import dcc from dash import html import dash_bootstrap_components as dbc -from utils import t1b1_df, isCurrentTab, Pages, component_ids, state_to_url +from utils import dataviz_df, isCurrentTab, Pages, component_ids, state_to_url def select_company_component(currentTab, state): @@ -37,7 +37,7 @@ def select_company_component(currentTab, state): options=[{ 'label': i, 'value': i - } for i in t1b1_df['company_name']], + } for i in dataviz_df['company_name']], #value='Andros' multi=isCurrentTab(currentTab, Pages.COMPARE), searchable=True, diff --git a/dashboard/layout/pages/action_suivi.py b/dashboard/layout/pages/action_suivi.py index 7944280..e5e4d7e 100644 --- a/dashboard/layout/pages/action_suivi.py +++ b/dashboard/layout/pages/action_suivi.py @@ -1,5 +1,5 @@ from dash import html -from utils import card_style, t1b3_df +from utils import card_style, dataviz_df from layout.pages.action_suivi_global import action_suivi_global from layout.pages.action_suivi_actuel import action_suivi_actuel diff --git a/dashboard/layout/pages/action_suivi_global.py b/dashboard/layout/pages/action_suivi_global.py index 258d474..681c0e6 100755 --- a/dashboard/layout/pages/action_suivi_global.py +++ b/dashboard/layout/pages/action_suivi_global.py @@ -1,5 +1,5 @@ from dash import html -from utils import card_style, t1b3_df +from utils import card_style, dataviz_df def get_company_global_information(df_companies_global_information, selected_company): @@ -21,7 +21,7 @@ def get_company_global_information(df_companies_global_information, selected_com def action_suivi_global(selected_company): - company_global_information = get_company_global_information(t1b3_df, selected_company) + company_global_information = get_company_global_information(dataviz_df, selected_company) return html.Div( children=[ html.Div([ diff --git a/dashboard/layout/pages/engagements.py b/dashboard/layout/pages/engagements.py index 58ecc12..f3ba6c3 100644 --- a/dashboard/layout/pages/engagements.py +++ b/dashboard/layout/pages/engagements.py @@ -1,27 +1,27 @@ from dash import html import dash_daq as daq -from utils import card_style, t1b5_df +from utils import card_style, dataviz_df def engagements(selected_company): return html.Div(children=[ html.Div('Ses engagements', className="h5"), - html.Div(t1b5_df[t1b5_df['company_name'] == selected_company]['direct_commitments_sentence'], + html.Div(dataviz_df[dataviz_df['company_name'] == selected_company]['direct_commitments_sentence'], className="fst-italic"), html.Div([ - daq.Indicator(color=t1b5_df[t1b5_df['company_name'] == selected_company]['direct_ambition_hexa_color_code'], + daq.Indicator(color=dataviz_df[dataviz_df['company_name'] == selected_company]['direct_ambition_hexa_color_code'], value=True), - html.Div(t1b5_df[t1b5_df['company_name'] == selected_company]['direct_ambition_long_label'], + html.Div(dataviz_df[dataviz_df['company_name'] == selected_company]['direct_ambition_long_label'], className="text-muted"), ], className="d-flex align-items-center gap-2 mt-2 mb-3"), - html.Div(t1b5_df[t1b5_df['company_name'] == selected_company]['complete_commitments_sentence'], + html.Div(dataviz_df[dataviz_df['company_name'] == selected_company]['complete_commitments_sentence'], className="fst-italic"), html.Div([ daq.Indicator( - color=t1b5_df[t1b5_df['company_name'] == selected_company]['complete_ambition_hexa_color_code'], + color=dataviz_df[dataviz_df['company_name'] == selected_company]['complete_ambition_hexa_color_code'], value=True), - html.Div(t1b5_df[t1b5_df['company_name'] == selected_company]['complete_ambition_long_label'], + html.Div(dataviz_df[dataviz_df['company_name'] == selected_company]['complete_ambition_long_label'], className="text-muted"), ], className="d-flex align-items-center gap-2 mt-2"), diff --git a/dashboard/layout/pages/infos.py b/dashboard/layout/pages/infos.py index 4fff2d0..092562a 100644 --- a/dashboard/layout/pages/infos.py +++ b/dashboard/layout/pages/infos.py @@ -1,7 +1,7 @@ # Libraries import from dash import html -from utils import card_style, t1b7_df +from utils import card_style, dataviz_df import flag import ast @@ -9,29 +9,29 @@ def infos(selected_company): - top_brands = ast.literal_eval(t1b7_df[t1b7_df['company_name'] == selected_company]['top_brands'].values[0]) + top_brands = ast.literal_eval(dataviz_df[dataviz_df['company_name'] == selected_company]['top_brands'].values[0]) return html.Div( children=[ html.Div([ html.Div([ - html.Img(src=t1b7_df[t1b7_df['company_name'] == selected_company]['brand_logo'].values[0], + html.Img(src=dataviz_df[dataviz_df['company_name'] == selected_company]['brand_logo'].values[0], className="w-100 img-thumbnail"), ], className="col", style={"maxWidth": "110px"}), html.Div([ html.Div(selected_company + " " + - flag.flag(t1b7_df[t1b7_df['company_name'] == selected_company]['country_flag'].values[0]), + flag.flag(dataviz_df[dataviz_df['company_name'] == selected_company]['country_flag'].values[0]), className="h3"), - #html.Div('Sector: ' + t1b7_df[t1b7_df['company_name'] == selected_company]['sector'].values[0], #English version - html.Div('Secteur : ' + t1b7_df[t1b7_df['company_name'] == selected_company]['sector'].values[0], #French version + #html.Div('Sector: ' + dataviz_df[dataviz_df['company_name'] == selected_company]['sector'].values[0], #English version + html.Div('Secteur : ' + dataviz_df[dataviz_df['company_name'] == selected_company]['sector'].values[0], #French version className="text-muted text-nowrap"), html.Div([ - #'Revenue: ' + t1b7_df[t1b7_df['company_name'] == selected_company]['revenue'].values[0].round( #English version - 'C.A : ' + t1b7_df[t1b7_df['company_name'] == selected_company]['revenue'].values[0].round( #French version + #'Revenue: ' + dataviz_df[dataviz_df['company_name'] == selected_company]['revenue'].values[0].round( #English version + 'C.A : ' + dataviz_df[dataviz_df['company_name'] == selected_company]['revenue'].values[0].round( #French version decimals=1).astype(str) + ' B (' + - t1b7_df[t1b7_df['company_name'] == selected_company]['revenue_year'].values[0].astype(str) + ')' + dataviz_df[dataviz_df['company_name'] == selected_company]['revenue_year'].values[0].astype(str) + ')' ], className="text-muted text-nowrap") ], @@ -40,8 +40,8 @@ def infos(selected_company): className="row"), #html.Div('Main brands:', className="h5 mt-3"), #English version html.Div('Principales marques :', className="h5 mt-3"), #French version - #dash_table.DataTable({'test' : t1b7_df[t1b7_df['company_name']==selected_company]['top_brands'].values[0]}) - #html.Code(tabulate(t1b7_df[t1b7_df['company_name']==selected_company]['top_brands'].values[0], tablefmt='html')) + #dash_table.DataTable({'test' : dataviz_df[dataviz_df['company_name']==selected_company]['top_brands'].values[0]}) + #html.Code(tabulate(dataviz_df[dataviz_df['company_name']==selected_company]['top_brands'].values[0], tablefmt='html')) html.Ul( [html.Li(i, className="list-group-item") for i in top_brands], className="list-group p-0", diff --git a/dashboard/layout/pages/reduction_rate.py b/dashboard/layout/pages/reduction_rate.py index df97361..f0afd52 100644 --- a/dashboard/layout/pages/reduction_rate.py +++ b/dashboard/layout/pages/reduction_rate.py @@ -2,7 +2,7 @@ import dash_bootstrap_components as dbc import plotly.graph_objects as go -from utils import t2b2_df, card_style +from utils import dataviz_df, card_style def get_filtered_data(df, selected_companies): @@ -62,7 +62,7 @@ def build_lollipop_chart(accomplishment, color_accomplishment, companies_names, def chart_left(selected_companies): - df = get_filtered_data(t2b2_df, selected_companies) + df = get_filtered_data(dataviz_df, selected_companies) df = df.sort_values(by='direct_level').reset_index(drop=True) accomplishment = get_data(df, 'direct_level') color_accomplishment = get_data(df, 'direct_score_hexa_color_code') @@ -72,7 +72,7 @@ def chart_left(selected_companies): def chart_right(selected_companies): - df = get_filtered_data(t2b2_df, selected_companies) + df = get_filtered_data(dataviz_df, selected_companies) df = df.sort_values(by='complete_level').reset_index(drop=True) accomplishment = get_data(df, 'complete_level') color_accomplishment = get_data(df, 'complete_score_hexa_color_code') diff --git a/dashboard/layout/pages/sector_compare.py b/dashboard/layout/pages/sector_compare.py index 32a43b4..714db30 100644 --- a/dashboard/layout/pages/sector_compare.py +++ b/dashboard/layout/pages/sector_compare.py @@ -1,7 +1,7 @@ from dash import html -from utils import t1b4_df, card_style +from utils import dataviz_df, card_style -df_t1b4 = t1b4_df +df_t1b4 = dataviz_df printable_columns = [ 'company_name', 'global_score_logo_path', 'direct_score_short_label', 'complete_score_short_label', diff --git a/dashboard/utils.py b/dashboard/utils.py index 07fc9e7..23443d4 100644 --- a/dashboard/utils.py +++ b/dashboard/utils.py @@ -45,13 +45,13 @@ def state_to_url(*state): return f'?{state}' -t1b1_df = pd.read_csv('data/t1b1.csv') +# t1b1_df = pd.read_csv('data/t1b1.csv') t1b2_df = pd.read_csv('data/t1b2.csv') -t1b3_df = pd.read_csv('data/t1b3.csv') -t1b4_df = pd.read_csv('data/t1b4.csv') -t1b5_df = pd.read_csv('data/t1b5.csv') +# t1b3_df = pd.read_csv('data/t1b3.csv') +# t1b4_df = pd.read_csv('data/t1b4.csv') +# t1b5_df = pd.read_csv('data/t1b5.csv') # t1b6_df = pd.read_csv('data/t1b6.csv', sep=';') -t1b7_df = pd.read_csv('data/t1b1-7.csv') -t2b2_df = pd.read_csv('data/t2b2.csv') +# t1b7_df = pd.read_csv('data/t1b1-7.csv') +# t2b2_df = pd.read_csv('data/t2b2.csv') dataviz_df = pd.read_excel('data/BDD_for_dataviz.xlsx', sheet_name='Sheet1') \ No newline at end of file From 21d4d3815f49b74318e5073be438257fb7c8fb1e Mon Sep 17 00:00:00 2001 From: simondac Date: Wed, 6 Jul 2022 10:20:21 +0200 Subject: [PATCH 3/4] Branchement t1b2 sur nouvelle BDD --- dashboard/data/BDD_for_dataviz.xlsx | Bin 7005 -> 10880 bytes dashboard/layout/pages/action_suivi_actuel.py | 10 +++++----- dashboard/utils.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dashboard/data/BDD_for_dataviz.xlsx b/dashboard/data/BDD_for_dataviz.xlsx index 349dc5da572a6d4e7b2282df9c7d33ab6a9f3c98..90de7a104d17452086869bb364bbe399c77f1478 100644 GIT binary patch literal 10880 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 D*rGhb literal 7005 zcmZ`;1yCH>)*c24G6WkWI6;EDL(t%!U;%;-7F>gbAQ@bOLvSbP;O_1OclY3$;6K@| z{dbr5UUzkObya_-&;9B<=iYmcvK%}D7ytku12WC~RiB6|7n@&SS|Yj|9whmH*}L5uy~*j|VsV;Q#=v zf4XaAV{iQ1-|PqlrFK@3-+f=S`)(Glz^ivGTocsJN>;gZrM@ zAPu$FDPK%?imY$c&F+ah!dEt8_#rQ+JqchwRo;5{lb?Y9Cg!V75+x=Q0Fd+o0Kj=5 z#>JAw(ahM&_|H4rZ)*0nv>j%7!JiIc-(5^EtkAl+y{js49L$~PD!xMZ70GmdoLt!-Y{(*tJ1ZNGr%6Bqp%mbuCLYL>-i4R$Il zQPyX2w~Cb{R3 zP42p)R=|pCTSv=#Q(<+B?vYVxFP~nIXv8|1i_9@xWOj4`{$$M|=Z_a1`>7#)vyPlr zgv)EkF1%I!qrtYs2+Jz5FJ-yzc%v&9iP`Jr!=#(sJ%?IxNfp@wQJ zjahtH7z+#RD*En%-gKH;cn9*@J(`BHGiu04{gGK5;ne#$kIsH8*NX zL2Ssjff42Sno`@q|An;xjy*rIso2Nii;IYCYWCs7OVnLOK~pmI*phd{!|N#__LTJt z7n&XyN>bL8Q+X}r&!?g#sU%W+nCjNCcq?Vl*>QxCll|h~D-#2=P}pMA{eD$+6=E&p zcvLqb_bi15{4B6Zc&U-DDKiWGg(*q6n&hzQFk*TABwKRiLakvwGfop1E{)Gv;T20M@MlY%tP9Ygl)UDBAyQ8WwHm2AWp^K!~uN1DNH z4#HMR7?G2|*{Gn~9pYsY7bXt3Zn{3C~CuE5EC+d#!YBniRWEq zmj~6?!tNSzQ5>znx_Mj36(ywKvo{#wG&C9U6f07f=i%F-;Bc&FQa@hVg#8RVO@!MN z-FBJQZJ&OV+nP^)6C9R|VLzqD@nzRBXmW*j*g2nMCcH&ygsQ(!&G+XN`bNr*ig;X0 zDzxF|g31%y)u3GL;|_N}GRxCe@XM!#&y(3>IQy{n>}C3BH4mkSY3o?9_M)VrE=pB%6Wn)1-+{6X z(WXY}R~<9v3BpbhBeLFkb1oY*wE?T8tr65--+`q&3Na2}3hHfD45D#}SKG_|sETf? zq~Vo4D;=;^B<%+YmzoEJ=63Ne0D1x?lWoySTrryI#C$OqVhz z*vhhyiczv!zh>%~5xfl1XG(kW8Kwd}d99|;rrib45T5Z-K15>Mb}LRtZ*3%UZ7#>S z(i%qh;hEL**L-c}@i?XheT&AWt!gC0YT73yP48b;;3^K^y)EiV1z{=Tp&gd_;Yc`egVDXOj(|Rp9AdBdE40QFP%RzqP>~Ryrv&3?KSkY9YHV;&2?&t_ z-+t}zFzWq>kf|$1Z!4%OJ7faCPdu>oC5OHEv?}#!@hlCR@7${DU_D_IjlNvFn{_hN zi~Bj<@s}0&FC|Yizb=!O`#U7M)wD?z-fK>hUa~Lo+0OAV!s~A0Fp6h=YV`;T^1>=G zY^sAPT~a3rRJb2|lPBIx&ShOJEQ3Cd7ieWe7_fxpo_r*WL^2A|KI7E;0yZqlDJ|-n zWdpf-X`X`8O?a35B@zfZCV~t3LQ!o*Cqy=c=f=^^F3>rNBM^1jzE*K(t}CJn&fguP zm$Y?+t?UOk!#$cnsNBxIQ2>A!tN;MPpA*Oj8+!`}Gh<^%2bMn`f6O9-iRKP-yx4yC zs8ern4poVRa>Gj3=(WlWySJ_a9L8f&GspvRf|euGNN%sqm8Fo8$+OP=0}B|VEYE_w zW-zcewtXQ>r*vK8zu1DKZf+N&N6&^ODKTRL3~T=#7rWAncZ+OIUW7 zCwpV-HP@wO3LdnLl%ir|7yQ(WKkbR6q`UJP?-INc*I;i|G6_Pt9I_sgI{e9q2M)87 z{)*%yJX{mJ7B3@8d#{~;a9bGTst(gQxh;byZ=&e4i|bGt2~b=*to#{*MVk3M=fnC2 zh=pk59#ra2%P-W|6C6=GNlNCsw+fxmts)JQLfI{FPw?jQx!SgqHldT<{ERSor1Duz zaL<)e$L#~x;zbMTug_R1pe_|3!$2_`G+*cBmOS;AJcq-n`VafQTl&y%h44aV7J4

z)-Pd0%Be2q1EF3V$c3V(VRYpc<=( zO%X{v+wqjUp|~`c>kR?-(#q2GYpz@}W`xU|F=Khm=1&N` zx^!h|O*XtKYwsCn@K`YKny^6hRu8G|6XfD6sq?GeJ{E}r^VMEalbDrJPE8QfDWt4t z1oc8euV3Y|Qz&!|P&|+9C3dQ{H$v}1Fv%(tO&G6@Es#$XeVWRPlHH!uo3%PxfT0+r z7H2r;mm^c^g0}%uI2A<}xQ0R;ka5&29Lp?Die6dBrj$C0aMfx&&u-}viSngOXXTl4 zV@FgV#RDTbgk&j>m`$29G!tvjAW- z?ETRW!}&E-T(2)R@SX{8Ss^jWz1k)yQ{K=&nep zny?du?O*A3Z&nVE&sMRxxaO_esccD`ng^ADo~S!kEe3p+s3FW>fO%n zc5}M!p;7kOGJiVe8d+uGfxtC_Bz~Gvv7KXa15Ag$V6* z^j$^+;Vsi-lDurTC)UufBSKK6ZUKl>QO;x&-NsCEH_vvyj?jvw^*Sf~Yy>dBZjENmGoxzu64D`06*3e9~7N708#8$nP%xl8e|EEMk7uL`u26Hb}pEiAfd(m=trwj7&^NyNM0Jl zdK)~SO?%TX*=5X2P#(K0&{ow=&EF#e%tYveRO=K~W16iUh&L1Pe=5|9>5Hzmj}|Mn zr(2Sth_?s`ck+3nz!4*JFefzEl1f?OslNxmWgyE|-w@PB7ltk$nidac)kSf4Lq+Tl z#^HR9wQvsuf2=*TtST}YyGTemoK+Zh@@+|}(RqK>v|q{Cyx^=)Dr`hQv!wGTUZpYrEmh5%AzEM&eQc+T70^m;z*)4Z3LQ%AbCG_o_wXDnybfdFt<8{}LG3qKe4Z7?Rt zuhn8v^Lc#$O9pYQE?THd+UB23o*uvp)CO&B#r%q1E|~98TQ0Dl#`~yt_gu~G;9_}~ zw)JPs$ftR3t$Qv|A?RLA?KTWl7r(AFhl^jcYP4MZl;^Tn$Qk}D5A06 zsg#{?J!~uiwhHtZDZG?kaZ~SSlQ(i%p6J@3H!LC@pt(e^Y|K54GMmwgO0V6Gs(J zz|G0OVy&=K2?sEoMI2Jb(KAq+Ma-nUdWa!}cd*4(QSrg@#XKom0^p zHwvGHXF;kO>KWKOp^7{fFZ10u{2->1`}t?g5A$gqm)mQmu{5tn`Q!Dkz4Qz0bnhA3 zOmd)tNVlUF&XRU&DzXqBs5SE^$Fukm#o|G^9fBo-lL`Ber^VdCK1z)r-BE zeBg7+d86Q`SVI^t#!U0vn#rJILl%d6gBMRyF9|Jg$R0 z#9g7nk%-z3hTyl8=Ob?5Q4|u5WHZ8Iy=uUofO@-9YYhDK#8GVM=*#3*`sDS)2CPi_ z;d;^%Ji93>&vq3Z@R&K0sTj{qOQMy|tjB&Q0)j0OjJ1d7dt)T}~I`o9%jEwvle@}OkA2US0a8lY!yZ0W$l{QI69DQ6921Bt+}jrHX7 zI)H42(zwh=j7oTQWCa|XAxQQ!Oqbzp_GNDtkY~G!wQ$B z?fcX3-@q>~o0D0y14pMMP-tvQE)oAd&^%d-C1dM@D{EH{MGI8B^SSSnES&Y)8zRbqVZ+44wR{?~CrK$=*iYqyP+o z4Dkzt&{GFyHHOi_(|HXh&3)K6czhG|(g|#>#jSBp&DNm&MW3jTTHx}eRx?rirp}=P z?+dcnLjuQrZ9u7s$lFjwCj88DjiHnNFogVHZ&WkOBzP~Ee5XyM&T7OzpS;aK<4$7_ ze#(@R&a9TszBIZMK`^}jDp8>mBA-Xou8+p3c^knqvRS`)nH8|u*g24$fD1QG?k+aYi3EfEF^*tCtK9WTfWIZRT^Js$-TuOvF29=s9YSXG^&|st&@3wwH_%6YpVnlFM zcPAN^L`dkUEc_(=%jfWX)EA-D5jj&lQFF^pJe$mBEC+#(w?>u?KTgp8O)kgoT3yit zsn-t#6aGo=pF;X4#eayZGUDaa&#WL{81@E$;M;gQFo(Gi7eBz~63hElX+hgQQ7b^2 zq>lCNaBTBWh$#zakh_4&lmPar8BL#Y_Z}%AOMnFGViY|ajsP|>F^yvG=<9}CI8i9_h(dNrsnQU4q zdW>9V*TqkV8|s2;BZL8d)0gV5;$SjgkqNITO+VxmN+)SW?E9SLfY+7wPgXzGe#E4A z0V*M$6JEMidTSjp84r`#WTG_n;b;z&=dzWWs?~;!5K;%OtuCKq$R113*4p>9cD>TE z6-x;$51=?>SW*4u<`o^{XUTxmDBW$IQ4ZWOgX`}nG_3bzY@k zlv&P42%RMZWTzieU)*XFx?-f?9=cD$vZK0`&;wRp!h|2{A8O%QqaSxB{=@@n_;H;7 u4W7pP1N=Xt{;{3Mq4c+%MtlI^zXX=D9O6T}1pq*KIE5ZEILfo%Z~q4naIBO7 diff --git a/dashboard/layout/pages/action_suivi_actuel.py b/dashboard/layout/pages/action_suivi_actuel.py index 627ec5f..cef11dd 100644 --- a/dashboard/layout/pages/action_suivi_actuel.py +++ b/dashboard/layout/pages/action_suivi_actuel.py @@ -4,7 +4,7 @@ import dash_daq as daq from utils import card_style -from utils import t1b2_df +from utils import dataviz_df import plotly.graph_objects as go import plotly.figure_factory as ff @@ -100,7 +100,7 @@ def build_bullet_gauge(engagement, accomplishment, color_accomplishment): def top_left(selected_company): - df = get_filtered_data(t1b2_df, selected_company) + df = get_filtered_data(dataviz_df, selected_company) value = get_data(df, 'direct_score_short_label') color = get_data(df, 'direct_score_hexa_color_code') pic = 'assets/frames/Picto_usine.png' @@ -128,7 +128,7 @@ def generate_topleft_item(selected_company): def top_right(selected_company): - df = get_filtered_data(t1b2_df, selected_company) + df = get_filtered_data(dataviz_df, selected_company) value = get_data(df, 'complete_score_short_label') color = get_data(df, 'complete_score_hexa_color_code') pic = 'assets/frames/Picto_lifecycle.png' @@ -156,7 +156,7 @@ def generate_topright_item(selected_company): def bottom_left(selected_company): - df = get_filtered_data(t1b2_df, selected_company) + df = get_filtered_data(dataviz_df, selected_company) values = [] col_list = ['c1_final_value', 'c1_2_deg_final', 'c1_1_8_deg_final', 'c1_1_5_deg_final'] @@ -219,7 +219,7 @@ def generate_bottomleft_item(selected_company): def bottom_right(selected_company): - df = get_filtered_data(t1b2_df, selected_company) + df = get_filtered_data(dataviz_df, selected_company) values = [] col_list = ['c2_final_value', 'c2_2_deg_final', 'c2_1_8_deg_final', 'c2_1_5_deg_final'] diff --git a/dashboard/utils.py b/dashboard/utils.py index 23443d4..e9d7f35 100644 --- a/dashboard/utils.py +++ b/dashboard/utils.py @@ -46,7 +46,7 @@ def state_to_url(*state): # t1b1_df = pd.read_csv('data/t1b1.csv') -t1b2_df = pd.read_csv('data/t1b2.csv') +# t1b2_df = pd.read_csv('data/t1b2.csv') # t1b3_df = pd.read_csv('data/t1b3.csv') # t1b4_df = pd.read_csv('data/t1b4.csv') # t1b5_df = pd.read_csv('data/t1b5.csv') From 7625782bcbcf7ae61d931cdaeb15555b2b7dc2cf Mon Sep 17 00:00:00 2001 From: simondac Date: Wed, 13 Jul 2022 09:20:26 +0200 Subject: [PATCH 4/4] Delete ~$BDD Surcouche pour dataviz_v03.xlsx --- .../data/~$BDD Surcouche pour dataviz_v03.xlsx | Bin 165 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 dashboard/data/~$BDD Surcouche pour dataviz_v03.xlsx diff --git a/dashboard/data/~$BDD Surcouche pour dataviz_v03.xlsx b/dashboard/data/~$BDD Surcouche pour dataviz_v03.xlsx deleted file mode 100644 index c0e165148dae8f2934f1adf726c49c312d16e19d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmWd$%Fj*A%u{eFP0LJ8Q_x7QDAChYAP7Vlf*A4{av2gCG8yt16c}6>N*U6C>{KAB Tz@P!7D;P=`^cXaOJjx*eNm~{>