Python 2 support for unicode strings in columns, fix gaps in cell borders.

Author: Tim Shawver

js/src/qgrid.css

@@ -286,12 +286,12 @@
 .q-grid .slick-cell {
   border-bottom: 1px solid #e1e8ed;
   border-right: none;
-  border-top: 1px solid transparent;
   border-left: 1px solid transparent;
   font-size: 13px;
   font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  padding-top: 3px;
   padding-left: 0px;
+  padding-top: 4px;
+  border-top: none;
 }
 
 .q-grid.highlight-selected-row .slick-cell.selected {
@@ -322,7 +322,16 @@
 
 .q-grid .slick-cell.idx-col {
   font-weight: bold;
+  margin-right: 3px;
+}
+
+.q-grid .slick-cell.idx-col.last-idx-col {
   border-right: 1px solid rgb(225, 232, 237);
+}
+
+.q-grid .slick-cell.idx-col:not(.first-idx-col) {
+  font-weight: bold;
+  border-left: 1px solid rgb(225, 232, 237);
   margin-right: 3px;
 }
 
@@ -351,27 +360,27 @@
 .q-grid .slick-cell.l0.r0 {
   border-left: none;
   padding-left: 6px;
-  z-index: 90;
+  z-index: 85;
 }
 
 .q-grid .slick-cell.l1.r1 {
-  z-index: 89;
+  z-index: 86;
 }
 
 .q-grid .slick-cell.l2.r2 {
-  z-index: 88;
+  z-index: 87;
 }
 
 .q-grid .slick-cell.l3.r3 {
-  z-index: 87;
+  z-index: 88;
 }
 
 .q-grid .slick-cell.l4.r4 {
-  z-index: 86;
+  z-index: 89;
 }
 
 .q-grid .slick-cell.l5.r5 {
-  z-index: 85;
+  z-index: 90;
 }
 
 .q-grid .slick-cell.selected {

js/src/qgrid.widget.js

@@ -347,6 +347,13 @@ class QgridView extends widgets.DOMWidgetView {
       if (cur_column.is_index) {
         slick_column.editor = editors.IndexEditor;
         slick_column.cssClass += ' idx-col';
+        if (cur_column.first_index){
+          slick_column.cssClass += ' first-idx-col';
+        }
+        if (cur_column.last_index){
+          slick_column.cssClass += ' last-idx-col';
+        }
+
         slick_column.name = cur_column.index_display_text;
         slick_column.level = cur_column.level;
         this.index_columns.push(slick_column);

qgrid/grid.py

@@ -19,6 +19,7 @@
 )
 from itertools import chain
 from uuid import uuid4
+from six import string_types
 
 # versions of pandas prior to version 0.20.0 don't support the orient='table'
 # when calling the 'to_json' function on DataFrames.  to get around this we
@@ -354,6 +355,13 @@ def show_grid(data_frame, show_toolbar=None,
 PAGE_SIZE = 100
 
 
+def stringify(x):
+    if isinstance(x, string_types):
+        return x
+    else:
+        return str(x)
+
+
 @widgets.register()
 class QgridWidget(widgets.DOMWidget):
     """
@@ -794,7 +802,7 @@ def should_be_stringified(col_series):
             else:
                 series_to_set = self._get_col_series_from_df(
                     col_name, df, level_vals=True
-                ).map(str)
+                ).map(stringify)
             self._set_col_series_on_df(col_name, df, series_to_set)
 
         if type(df.index) == pd.core.index.MultiIndex and \
@@ -809,7 +817,7 @@ def should_be_stringified(col_series):
                 prev_idx = row_loc - 1
                 for idx, index_val in enumerate(index):
                     col_name = self._primary_key[idx]
-                    if previous_value == None:
+                    if previous_value is None:
                         row_style[col_name] = 'group-top'
                         continue
                     elif index_val == previous_value[idx]:
@@ -823,11 +831,16 @@ def should_be_stringified(col_series):
                         else:
                             row_style[col_name] = 'group-middle'
                     else:
-                        row_style[col_name] = 'single' if last_row else 'group-top'
+                        if last_row:
+                            row_style[col_name] = 'single'
+                        else:
+                            row_style[col_name] = 'group-top'
                         if prev_idx >= 0:
-                            if row_styles[prev_idx][col_name] == 'group-middle':
+                            if row_styles[prev_idx][col_name] == \
+                                    'group-middle':
                                 row_styles[prev_idx][col_name] = 'group-bottom'
-                            elif row_styles[prev_idx][col_name] == 'group-top':
+                            elif row_styles[prev_idx][col_name] == \
+                                    'group-top':
                                 row_styles[prev_idx][col_name] = 'group-single'
                 previous_value = index
                 row_styles[row_loc] = row_style
@@ -855,9 +868,13 @@ def should_be_stringified(col_series):
             if ('primaryKey' in df_schema):
                 self._primary_key = df_schema['primaryKey']
             else:
-                # for some reason, 'primaryKey' isn't set when the index is
-                # a single interval column. that's why this case is here.
-                self._primary_key = [df.index.name]
+                # for some reason, 'primaryKey' isn't set in certain cases,
+                # like when we have an interval index. that's why this case
+                # is here.
+                if df.index.name is not None:
+                    self._primary_key = [df.index.name]
+                else:
+                    self._primary_key = ['index']
 
             columns = {}
             for i, cur_column in enumerate(df_schema['fields']):
@@ -876,6 +893,11 @@ def should_be_stringified(col_series):
                         self._primary_key_display[col_name]
                     if len(self._primary_key) > 0:
                         cur_column['level'] = self._primary_key.index(col_name)
+                    level = self._primary_key.index(col_name)
+                    if level == 0:
+                        cur_column['first_index'] = True
+                    if level == (len(self._primary_key) - 1):
+                        cur_column['last_index'] = True
 
                 cur_column['position'] = i
                 columns[col_name] = cur_column

qgrid/tests/test_grid.py

@@ -541,7 +541,10 @@ def test_object_dtype():
 
 
 def test_index_categorical():
-    df = pd.DataFrame({'foo': np.random.randn(3), 'future_index': [22, 13, 87]})
+    df = pd.DataFrame({
+        'foo': np.random.randn(3),
+        'future_index': [22, 13, 87]
+    })
     df['future_index'] = df['future_index'].astype('category')
     df = df.set_index('future_index')
     widget = QgridWidget(df=df)