Update app.py

app.py

@@ -237,7 +237,6 @@ def datavisualisation_skills_context(df, template, paper_bgcolor, plot_bgcolor,
 def datavisualisation_chiffres_cles_emplois(url):
     response = requests.get(url)
     soup = BeautifulSoup(response.text, "html.parser")
-    print("Le code HTML est : " + soup)
     alldemandeurs = ''
     allsalaires = ''
     alldifficultes = ''
@@ -251,14 +250,12 @@ def datavisualisation_chiffres_cles_emplois(url):
         allnumembauches = allnumembauches.replace(" ","").strip()
     else:
         allnumembauches = removeTags(allnumembauchesfirst[0]).replace(" ","").strip()
-    print("Embauches : " + allnumembauches)
     if removeTags(allnumembauchesfirst[1]).find('\xa0') != -1:
         allnumoffres = removeTags(allnumembauchesfirst[1]).split('\xa0')
         allnumoffres = ''.join(allnumoffres)
         allnumoffres = allnumoffres.replace(" ","").strip()
     else:
         allnumoffres = removeTags(allnumembauchesfirst[1]).replace(" ","").strip()
-    print("Offres : " + allnumoffres)
     
     alldetailembauches = soup.select('p.hiring_text.ng-star-inserted')
     allnumevolutionembauches = soup.select('p.main.ng-star-inserted')
@@ -276,7 +273,6 @@ def datavisualisation_chiffres_cles_emplois(url):
         alldemandeurs += "</td>"
     alldemandeurs += "<td>" + allnumoffres + "</td></tr>"
     alldemandeurs += "</table>"
-    print("Rapport Offres / Demandeurs : " + alldemandeurs)
     
     allFAP = soup.select('tr.sectorTable__line.ng-star-inserted')
     allcategorie = soup.select('td.sectorTable__cell')
@@ -292,7 +288,6 @@ def datavisualisation_chiffres_cles_emplois(url):
             allsalaires += "<tr><td>" + removeTags(alltypesalaires[2]) + "</td><td>" + removeTags(allcategorie[4]) + "</td><td>" + removeTags(allFAPsalaires[4]).replace('\xa0','').replace(' ','').replace('€','').replace('&nbsp;','').strip() + "</td></tr>"
             allsalaires += "<tr><td>" + removeTags(alltypesalaires[3]) + "</td><td>" + removeTags(allcategorie[4]) + "</td><td>" + removeTags(allFAPsalaires[5]).replace('\xa0','').replace(' ','').replace('€','').replace('&nbsp;','').strip() + "</td></tr>"
         allsalaires += "</table>"
-    print("Salaires : " + alldemandeurs)
     
     alltypedifficultes = soup.select('.tabs-main-content_persp-col2-bar.ng-star-inserted')
     alldifficulte = soup.select('p.horizontal-graph_title')
@@ -301,7 +296,6 @@ def datavisualisation_chiffres_cles_emplois(url):
     for i in range(0,len(alltypedifficultes)):
         alldifficultes += "<tr><td>" + removeTags(alldifficulte[i]) + "</td><td>" + removeTags(allpcdifficulte[i]).replace('Pour le territoire principal FRANCE pour les ' + removeTags(alldifficulte[i]),'').replace('%','').strip() + "</td></tr>"
     alldifficultes += "</table>"
-    print("Difficultés : " + alldifficultes)
     
     alltyperepartitions = soup.select('div.hiring-contract_legende_item.ng-star-inserted')
     allrepartition = soup.select('p.hiring-contract_legende_item_label')
@@ -310,8 +304,7 @@ def datavisualisation_chiffres_cles_emplois(url):
     for i in range(0,len(alltyperepartitions)):
         allrepartitions += "<tr><td>" + removeTags(allrepartition[i]).replace('(' + removeTags(allpcrepartition[i]) + ')','') + "</td><td>" + removeTags(allpcrepartition[i]).replace('%','').replace(',','.') + "</td></tr>"
     allrepartitions += "</table>"
-    print("Répartition : " + allrepartitions)
-
+    
     allentrepriserepartitions = soup.select('div.horizontal-graph_pattern.sm-bubble_wrapper > span')
     allentreprise = soup.select('span.sr-only')
     allpcentreprise = soup.select('span.data.ng-star-inserted')
@@ -319,7 +312,6 @@ def datavisualisation_chiffres_cles_emplois(url):
     for i in range(0,len(allentrepriserepartitions)):
         allentreprises += "<tr><td>" + removeTags(allentrepriserepartitions[i])[0:-4] + "</td><td>" + removeTags(allentrepriserepartitions[i])[-4:].replace('%','').replace(',','.').strip() + "</td></tr>"
     allentreprises += "</table>"
-    print("Entreprise : " + allentreprises)
     
     return [alldemandeurs, allsalaires, alldifficultes, allrepartitions, allentreprises]
 
@@ -1279,21 +1271,21 @@ def update_tableau(selectedData, array_value, theme):
     
     return create_tableau(df_FT, theme)
 
-#clientside_callback(
-#    """
-#    function updateLoadingState(n_clicks) {
-#        return true
-#    }
-#    """,
-#    Output("loading-button", "loading", allow_duplicate=True),
-#    Input("loading-button", "n_clicks"),
-#    prevent_initial_call=True,
-#)
+clientside_callback(
+    """
+    function updateLoadingState(n_clicks) {
+        return true
+    }
+    """,
+    Output("loading-button", "loading", allow_duplicate=True),
+    Input("loading-button", "n_clicks"),
+    prevent_initial_call=True,
+)
 
 @callback(
     Output("clicked-output", "children"),
     Output("clicked-output-tabs", "children"),
-    #Output("loading-button", "loading"),
+    Output("loading-button", "loading"),
     Input("loading-button", "n_clicks"),
     Input(component_id='framework-multi-select', component_property='value'),
     Input("mantine-provider", "forceColorScheme"),
@@ -1336,9 +1328,24 @@ def load_from_stats(n_clicks, array_value, theme):
     children_tabs = []
     for j in range(0, len(array_value)):
         table = datavisualisation_chiffres_cles_emplois("https://dataemploi.pole-emploi.fr/metier/chiffres-cles/NAT/FR/" + array_value[j])
+        
+        response = requests.get("https://dataemploi.pole-emploi.fr/metier/chiffres-cles/NAT/FR/" + array_value[j])
+        soup = BeautifulSoup(response.text, "html.parser")
+        allembauches = soup.select('p.population_category')
+        allnumembauchesfirst = soup.select('p.population_main-num.data')
+        if removeTags(allnumembauchesfirst[0]).find('\xa0') != -1:
+            allnumembauches = removeTags(allnumembauchesfirst[0]).split('\xa0')
+            allnumembauches = ''.join(allnumembauches)
+            allnumembauches = allnumembauches.replace("&nbsp;","").strip()
+        else:
+            allnumembauches = removeTags(allnumembauchesfirst[0]).replace("&nbsp;","").strip()
+        
+        print("Le code HTML est : " + soup)
+        print("Le nombre d'embauches : " + allnumembauches)
         array_label_rome = searchByRome(array_value[j])
         df_demandeur = htmlToDataframe(table[0])
         df_demandeur = df_demandeur.sort_values(by=['Indicateur'])
+        print(df_demandeur)
         fig_demandeur = px.histogram(df_demandeur, x='Indicateur', y='Valeur', height=800, template=template, title="Demandeurs d'emploi et offres d'emploi du code ROME : " +  array_label_rome[0]['label'], color='Indicateur', labels={'Valeur':'Nombre'}, text_auto=True).update_layout(font=dict(size=9),paper_bgcolor=paper_bgcolor,plot_bgcolor=plot_bgcolor,autosize=True)
         children.append(dmc.GridCol(html.Div(dcc.Loading(id="loadingPlot",children=(dcc.Graph(figure=fig_demandeur)),type="default")), span=6),)
         children_tabs.append(dmc.GridCol(html.Div(dcc.Loading(id="loadingPlot",children=[dbc.Label("Demandeurs d'emploi et offres d'emploi du code ROME : " + array_label_rome[0]['label']),dash_table.DataTable(data=df_demandeur.to_dict('records'),sort_action='native', columns=[{'id': c, 'name': c} for c in df_demandeur.columns],page_action='native', page_current= 0,page_size= 10,style_header=style_header,style_data=style_data,style_table={'overflowX': 'auto'},style_cell={'overflow': 'hidden','textOverflow': 'ellipsis','maxWidth': 0,})],type="default")), span=12),)
@@ -1368,7 +1375,7 @@ def load_from_stats(n_clicks, array_value, theme):
         children.append(dmc.GridCol(html.Div(dcc.Loading(id="loadingPlot",children=(dcc.Graph(figure=fig_repartitionEntreprise)),type="default")), span=6))
         children_tabs.append(dmc.GridCol(html.Div(dcc.Loading(id="loadingPlot",children=[dbc.Label("Répartition des embauches du métier : type entreprise du code ROME : " + array_label_rome[0]['label']),dash_table.DataTable(data=df_repartitionEntreprise.to_dict('records'),sort_action='native', columns=[{'id': c, 'name': c} for c in df_repartitionEntreprise.columns],page_action='native', page_current= 0,page_size= 10,style_header=style_header,style_data=style_data,style_table={'overflowX': 'auto'},style_cell={'overflow': 'hidden','textOverflow': 'ellipsis','maxWidth': 0,})],type="default")), span=12),)
 
-    return dmc.Grid(children=children), dmc.Grid(children=children_tabs)
+    return dmc.Grid(children=children), dmc.Grid(children=children_tabs), False
 
 #clientside_callback(
 #    """