maxspad commited on
Commit
dc45408
1 Parent(s): ec81259

removed pbars, re-arranged

Browse files
Files changed (1) hide show
  1. overview.py +23 -21
overview.py CHANGED
@@ -77,7 +77,7 @@ class NQDOverview(object):
77
  'bar': {'color': color, 'thickness': 1.0}
78
  }
79
  ),
80
- layout=go.Layout(margin=dict(t=100, b=100))
81
  )
82
  return fig
83
 
@@ -89,11 +89,11 @@ class NQDOverview(object):
89
 
90
  fig = self._build_figure()
91
 
92
- cols = st.columns([7, 3])
93
- with cols[0]:
94
- st.plotly_chart(fig, use_container_width=True)
95
- # prog_score, prog_theme = self.get_prog_setup('qual')
96
- # hc.progress_bar(prog_score, f'{prog_score:.2f}% confident', override_theme=prog_theme)
97
  with cols[1]:
98
  q1lab = self.results['q1']['label']
99
  if q1lab == 0:
@@ -104,13 +104,14 @@ class NQDOverview(object):
104
  md_str = '😊 Medium'
105
  elif q1lab == 3:
106
  md_str = '😁 High'
107
- # prog_score, prog_theme = self.get_prog_setup('q1')
108
- # hc.info_card(title='Level of Detail', content=md_str, sentiment='good', bar_value=prog_score)
109
  st.metric('Level of Detail', md_str,
110
- help='Q1 - Evidence - Does the rater provide sufficient evidence about resident performance? (0-no comment at all, 1-no, but comment present, 2-somewhat, 3-yes/full description)')
111
  prog_score, prog_theme = self.get_prog_setup('q1')
112
- hc.progress_bar(prog_score, f'{prog_score:.2f}% confident', override_theme=prog_theme)
113
 
 
114
  q2lab = self.results['q2i']['label']
115
  if q2lab == 0:
116
  md_str = '✅ Yes'
@@ -119,8 +120,9 @@ class NQDOverview(object):
119
  st.metric('Suggestion Given', (md_str),
120
  help='Q2 - Suggestion - Does the rater provide a suggestion for improvement? (0-no/1-yes)')
121
  prog_score, prog_theme = self.get_prog_setup('q2i')
122
- hc.progress_bar(prog_score, f'{prog_score:.2f}% confident', override_theme=prog_theme)
123
 
 
124
  q3lab = self.results['q3i']['label']
125
  if q3lab == 0:
126
  md_str = '✅ Yes'
@@ -129,16 +131,16 @@ class NQDOverview(object):
129
  st.metric('Suggestion Linked', md_str,
130
  help='Q3 - Connection - Is the rater’s suggestion linked to the behavior described? (0-no/1-yes)')
131
  prog_score, prog_theme = self.get_prog_setup('q3i')
132
- hc.progress_bar(prog_score, f'{prog_score:.2f}% confident', override_theme=prog_theme)
133
 
134
 
135
  def get_prog_setup(self, q):
136
- prog_score = self.results[q]['scores'][self.results[q]['label']] * 100
137
- if prog_score > 75:
138
- prog_sent = '#28a745'
139
- elif (prog_score > 25) and (prog_score <= 75):
140
- prog_sent = '#ffc107'
141
- else:
142
- prog_sent = '#dc3545'
143
- prog_theme = {'content_color': 'white', 'progress_color': '#aaa'}
144
- return prog_score, prog_theme
 
77
  'bar': {'color': color, 'thickness': 1.0}
78
  }
79
  ),
80
+ layout=go.Layout(margin=dict(t=0, b=0))
81
  )
82
  return fig
83
 
 
89
 
90
  fig = self._build_figure()
91
 
92
+
93
+ chart_cols = st.columns([8,2], gap="small")
94
+ chart_cols[0].plotly_chart(fig, user_container_width=True)
95
+
96
+ cols = st.columns([1,3,3,3])
97
  with cols[1]:
98
  q1lab = self.results['q1']['label']
99
  if q1lab == 0:
 
104
  md_str = '😊 Medium'
105
  elif q1lab == 3:
106
  md_str = '😁 High'
107
+ # prog_score, prog_theme = self.get_prog_setup('q1')
108
+ # hc.info_card(title='Level of Detail', content=md_str, sentiment='good', bar_value=prog_score)
109
  st.metric('Level of Detail', md_str,
110
+ help='Q1 - Evidence - Does the rater provide sufficient evidence about resident performance? (0-no comment at all, 1-no, but comment present, 2-somewhat, 3-yes/full description)')
111
  prog_score, prog_theme = self.get_prog_setup('q1')
112
+ # hc.progress_bar(prog_score, f'{prog_score:.2f}% confident', override_theme=prog_theme)
113
 
114
+ with cols[2]:
115
  q2lab = self.results['q2i']['label']
116
  if q2lab == 0:
117
  md_str = '✅ Yes'
 
120
  st.metric('Suggestion Given', (md_str),
121
  help='Q2 - Suggestion - Does the rater provide a suggestion for improvement? (0-no/1-yes)')
122
  prog_score, prog_theme = self.get_prog_setup('q2i')
123
+ # hc.progress_bar(prog_score, f'{prog_score:.2f}% confident', override_theme=prog_theme)
124
 
125
+ with cols[3]:
126
  q3lab = self.results['q3i']['label']
127
  if q3lab == 0:
128
  md_str = '✅ Yes'
 
131
  st.metric('Suggestion Linked', md_str,
132
  help='Q3 - Connection - Is the rater’s suggestion linked to the behavior described? (0-no/1-yes)')
133
  prog_score, prog_theme = self.get_prog_setup('q3i')
134
+ # hc.progress_bar(prog_score, f'{prog_score:.2f}% confident', override_theme=prog_theme)
135
 
136
 
137
  def get_prog_setup(self, q):
138
+ prog_score = self.results[q]['scores'][self.results[q]['label']] * 100
139
+ if prog_score > 75:
140
+ prog_sent = '#28a745'
141
+ elif (prog_score > 25) and (prog_score <= 75):
142
+ prog_sent = '#ffc107'
143
+ else:
144
+ prog_sent = '#dc3545'
145
+ prog_theme = {'content_color': 'white', 'progress_color': '#aaa'}
146
+ return prog_score, prog_theme