diff --git a/.gitignore b/.gitignore index 0b51f9f18..4e9863d84 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ #https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems .iws workspace.xml -tasks.xml \ No newline at end of file +tasks.xml +.idea \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 26d33521a..000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/.idea/BlocklyML.iml b/.idea/BlocklyML.iml deleted file mode 100644 index ea15fb93c..000000000 --- a/.idea/BlocklyML.iml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/csv-plugin.xml b/.idea/csv-plugin.xml deleted file mode 100644 index 2277bcfab..000000000 --- a/.idea/csv-plugin.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml deleted file mode 100644 index b3820067b..000000000 --- a/.idea/git_toolbox_prj.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 105ce2da2..000000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 5c6b4793f..000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 9026332fc..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f4..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app.py b/app.py index eaf923bce..2292d5a4e 100644 --- a/app.py +++ b/app.py @@ -51,7 +51,6 @@ DASH_APP.layout = html.Div() - @app.route('/DataVisualizer', methods=['POST', 'GET']) def dataframe_return(): """returns list of Dataframes from dataframe_visualizer @@ -59,6 +58,7 @@ def dataframe_return(): Returns: string: list of datafrmaes """ + # pylint: disable=W0603 global DASH_APP list_dataframe, DASH_APP = dataframe_visualizer(request.form, DASH_APP) return str(list_dataframe) diff --git a/libs/dashboard.py b/libs/dashboard.py index ab3723953..882c832c0 100644 --- a/libs/dashboard.py +++ b/libs/dashboard.py @@ -1,17 +1,11 @@ """Instantiate a Dash app.""" -import numpy as np -import pandas as pd -import dash from dash import dash_table from dash import dcc import plotly.express as px -import json from dash import html -import dash_daq as daq from dash.dependencies import Input, Output, State -import string -import random -import urllib.parse + + import plotly.graph_objects as go import dash_bootstrap_components as dbc from .util import floatNoneConvert, strNoneConvert, otherinputtodict @@ -35,13 +29,6 @@ def dashboard_app(df, dash_app, plotly_config): "backgroundColor": "black", "color": "white", } - - dropdown_style = { - "fontWeight": "bold", - "backgroundColor": "black", - "color": "white", - } - tab_selected_style = { "borderTop": "1px solid #d6d6d6", "borderBottom": "1px solid #d6d6d6", @@ -49,16 +36,9 @@ def dashboard_app(df, dash_app, plotly_config): "color": "white", "padding": "6px", } - not_mandatory_font_style = {"color": "blue"} mandatory_font_style = {"color": "red"} mandatory_div_style = {" marginLeft": "1%", "width": "48%", "display": "inline-grid"} - only_mandatory_div_style = { - " marginLeft": "1%", - "width": "98%", - " marginRight": "1%", - "display": "inline-grid", - } not_mandatory_div_style = { " marginLeft": "2%", "border-spacing": "2px", @@ -1829,7 +1809,7 @@ def update_areaplot(n_clicks, input1, input2, input3, input4, input5): State("input-other-heat", "value"), ) def update_heatplot(n_clicks, input1, input2, input3, input4): - if not (input1 is None) and not (input2 is None): + if not input1 is None and not input2 is None: if strNoneConvert(input1) in df.columns and strNoneConvert(input2) in df.columns: input_parametes = { @@ -1855,7 +1835,7 @@ def update_heatplot(n_clicks, input1, input2, input3, input4): State("input-other-violin", "value"), ) def update_violinplot(n_clicks, input1, input2, input3, input4): - if not (input1 is None): + if not input1 is None: if strNoneConvert(input1) in df.columns: input_parametes = { @@ -2130,7 +2110,7 @@ def update_streamtubeplot(n_clicks, input1, input2, input3, input4, input5, inpu State("input-custom-code", "value"), ) def update_customplot(n_clicks, input1): - if not (input1 is None): + if not input1 is None: df _locals = locals() exec(input1, globals(), _locals) diff --git a/libs/util.py b/libs/util.py index e3e7dc834..d675e51a5 100644 --- a/libs/util.py +++ b/libs/util.py @@ -1,31 +1,29 @@ """ Python script with utility functions """ -def strNoneConvert(input): +def strNoneConvert(input_data): """ Converting input to string if it is not a list or none """ - if input is None: + if input_data is None: return None - if input is list: + if input_data is list: return list - else: - return str(input) + return str(input_data) -def floatNoneConvert(input): +def floatNoneConvert(input_data): """ Converting input to float if it is not a list or none """ - if input is None or input == '': + if input_data is None or input_data == '': return None - if input is list: + if input_data is list: return list - else: - return float(input) + return float(input_data) -def otherinputtodict(input): +def otherinputtodict(input_data): """ Dict [parser funtion for other inputs """ input_parameter_dict = {} - if not(input is None): - if "=" in input: - input_parameter_list = input.split(",") + if not input_data is None: + if "=" in input_data: + input_parameter_list = input_data.split(",") for parameter in input_parameter_list: input_parameter_dict[parameter.split( "=")[0]] = parameter.split("=")[1]