Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix code style and indentation #9

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix code style and indentation #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8985d89
Fix indentation
Oct 24, 2016
81979ff
Fix code style in ContentTableHandler
Oct 24, 2016
d1a6bc0
Fix code style in ContentChartHandler
Oct 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ContentChartHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ def __init__(self, src, x_label, y_label, **kwargs):
self.x_label = x_label
self.y_label = y_label


def get_plot_image(self, **kwargs):

output = tempfile.mkstemp(suffix='.png')[1]
Expand All @@ -25,10 +24,11 @@ def get_plot_image(self, **kwargs):
df = pd.read_csv(self.src, delimiter='|', index_col=[0], header=0)
except Exception as e:
if isinstance(e, IOError):
exception = IOError("{}. Please make sure we are using absolute paths".format(e.message))
exception = IOError("{}. Please make sure we are using "
"absolute paths"
.format(e.message))
raise exception


# generate the plot
params = {
'kind': 'bar',
Expand All @@ -46,7 +46,8 @@ def get_plot_image(self, **kwargs):
for idx, label in enumerate(list(df.index)):
for acc in df.columns:
value = np.round(df.ix[idx][acc], decimals=2)
plot.annotate(value, (idx, value), xytext=(0, 15), textcoords='offset points')
plot.annotate(value, (idx, value), xytext=(0, 15),
textcoords='offset points')

# set the labels
plot.set_ylabel(self.y_label)
Expand All @@ -57,4 +58,3 @@ def get_plot_image(self, **kwargs):
fig.savefig(output)

return output

27 changes: 15 additions & 12 deletions ContentTableHandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def _prettify_header(self, df):
header = df.columns
rename = {}
for column in header:
rename[column] = (column.title().replace('_',' '))
rename[column] = (column.title().replace('_', ' '))
df.rename(columns=rename, inplace=True)

return df
Expand All @@ -30,38 +30,41 @@ def _get_dataframe(self):
self.DF = pd.read_csv(self.src, delimiter='|')
except Exception as e:
if isinstance(e, IOError):
exception = IOError("{}. Please make sure we are using absolute paths".format(e.message))
exception = IOError("{}. Please make sure we are using "
"absolute paths"
.format(e.message))
raise exception

self.DF = self._prettify_header(self.DF)

return self.DF

def _get_dataframe_sum(self):

columns_types = self.DF.dtypes
num_cols = []
for index, value in columns_types.iteritems():
if value != 'object':
num_cols.append(index)
df_sum = self.DF[num_cols].sum()
num_cols = []
for index, value in columns_types.iteritems():
if value != 'object':
num_cols.append(index)
df_sum = self.DF[num_cols].sum()

self.DF_SUM = pd.DataFrame(data=df_sum)
return self.DF_SUM

def _get_df_html(self, df, **kwargs):
html_out = df.to_html(**kwargs).replace('border="1"','border="0"')
html_out = df.to_html(**kwargs).replace('border="1"', 'border="0"')
return html_out

def _get_table_html(self):
result = self._get_df_html(self.DF, index=False, classes='table table-striped detailed')
result = self._get_df_html(self.DF, index=False,
classes='table table-striped detailed')
return result

def _get_table_meta_html(self):
result = self._get_df_html(self.DF_SUM, header=False, classes='table meta-info')
result = self._get_df_html(self.DF_SUM, header=False,
classes='table meta-info')
return result


def get_table(self, ):
result = {
'meta': self._get_table_meta_html(),
Expand Down