Update app.py

app.py

@@ -980,7 +980,7 @@ def create_emploi(df, theme, customRepartition):
     
     return fig_intitule
 
-def create_contrat(df, theme):
+def create_contrat(df, customEmplois, theme):
     if theme == "dark":
         template = "plotly_dark"
         paper_bgcolor = 'rgba(36, 36, 36, 1)'
@@ -990,7 +990,9 @@ def create_contrat(df, theme):
     
     ######## Types de contrat ########
     df_contrat = df.groupby('typeContratLibelle').size().reset_index(name='obs')
-    fig_contrat = px.pie(df_contrat, names='typeContratLibelle', values='obs', color='obs', height=600, template=template, title="Les types de contrat", labels={'obs':'nombre'}, color_discrete_sequence=px.colors.qualitative.Safe).update_traces(textposition='inside', textinfo='percent+label').update_layout(font=dict(size=10),paper_bgcolor=paper_bgcolor)
+    fig_contrat = px.pie(df_contrat, names='typeContratLibelle', values='obs', color='obs', height=600, template=template, labels={'obs':'nombre'}, color_discrete_sequence=px.colors.qualitative.Safe).update_traces(textposition='inside', textinfo='percent+label').update_layout(font=dict(size=10),paper_bgcolor=paper_bgcolor).add_annotation(x=0, y=1.0, xanchor='left', yanchor='bottom',
+                       xref='paper', yref='paper', showarrow=False, align='left',
+                       text='Les types de contrat<br><b>{}</b>'.format(customEmplois),font=dict(size=14))
     
     return fig_contrat
 
@@ -1116,11 +1118,17 @@ def update_emploi(selectedData, array_value, theme):
     Output(component_id='figContrats', component_property='figure'),
     Input('figRepartition', 'selectedData'),
     Input(component_id='framework-multi-select', component_property='value'),
+    Input('figEmplois', 'selectedDataEmplois'),
     Input("mantine-provider", "forceColorScheme"),
 )
 
-def update_contrat(selectedData, array_value, theme):
+def update_contrat(selectedData, array_value, selectedDataEmplois, theme):
+    df_FT = API_France_Travail(array_value)
+    df = df_FT[['intitule','typeContratLibelle','experienceLibelle','lieuTravail']].copy()
+    
     options = []
+    options_FT = []
+    
     if selectedData != None:
         if type(selectedData['points'][0]['hovertext']) == str:
             options.append(selectedData['points'][0]['hovertext'])
@@ -1129,8 +1137,16 @@ def update_contrat(selectedData, array_value, theme):
     else:
         options = ['01','02','03','04','05','06','07','08','09','10','11','12','13','14','15','16','17','18','19','2A','2B','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','36','37','38','39','40','41','42','43','44','45','46','47','48','49','50','51','52','53','54','55','56','57','58','59','60','61','62','63','64','65','66','67','68','69','70','71','72','73','74','75','76','77','78','79','80','81','82','83','84','85','86','87','88','89','90','91','92','93','94','95','971','972','973','974']
     
-    df_FT = API_France_Travail(array_value)
-    df = df_FT[['intitule','typeContratLibelle','experienceLibelle','lieuTravail']].copy()
+    if selectedDataEmplois != None:
+        customEmplois = selectedDataEmplois['points'][0]['y'][:-3]
+        if type(selectedDataEmplois['points'][0]['y']) == str:
+            options_FT.append(selectedDataEmplois['points'][0]['y'][:-3])
+        else:
+            options_FT = selectedDataEmplois['points'][0]['y'][:-3]
+    else:
+        customEmplois = " "
+        options_FT = df['intitule'].values.tolist()   
+    
     df["lieuTravail"] = df["lieuTravail"].apply(lambda x: x['libelle']).apply(lambda x: x[0:3]).apply(lambda x: x.strip())
     df.drop(df[df['lieuTravail'] == 'Fra'].index, inplace = True)
     df.drop(df[df['lieuTravail'] == 'FRA'].index, inplace = True)
@@ -1139,8 +1155,9 @@ def update_contrat(selectedData, array_value, theme):
     df.drop(df[df['lieuTravail'] == 'Bou'].index, inplace = True)
     df.drop(df[df['lieuTravail'] == '976'].index, inplace = True)
     df = df[df['lieuTravail'].isin(options)]
+    df = df[df['intitule'].isin(options_FT)] 
         
-    return create_contrat(df, theme)
+    return create_contrat(df, customEmplois, theme)
 
 @callback(
     Output(component_id='figExperiences', component_property='figure'),