Add options and test

Author: Brad Miller

runestone/spreadsheet/css/spreadsheet.css

@@ -0,0 +1,6 @@
+div.runestone .jexcel_container {
+    max-height: 550px;
+    overflow: scroll;
+    max-width: 800px;
+    overflow: scroll;
+}

runestone/spreadsheet/js/spreadsheet.js

@@ -9,6 +9,11 @@ class SpreadSheet extends RunestoneBase {
         this.data = eval(`${this.div_id}_data`);
         this.autograde = $(orig).data("autograde");
         this.suffix = window[`${this.div_id}_asserts`];
+        this.mindimensions = $(orig).data("mindimensions");
+        this.colwidths = $(orig).data("colwidths");
+        this.coltitles = eval($(orig).data("coltitles"));
+        this.maxHeight = 50;
+        // Render the components
         this.renderSheet();
 
         if (this.autograde) {
@@ -19,7 +24,29 @@ class SpreadSheet extends RunestoneBase {
 
     renderSheet() {
         let div = document.getElementById(this.sheet_id);
-        this.table = jexcel(div, {data:this.data});
+        let opts = {data:this.data,
+            tableHeight: this.maxHeight
+        };
+        if (this.mindimensions) {
+            opts.minDimensions = this.mindimensions;
+        }
+        opts.columns = [];
+        if (this.colwidths) {
+            for (let w of this.colwidths) {
+                opts.columns.push({width:w});
+            }
+        }
+        if (this.coltitles) {
+            for (let i in this.coltitles) {
+                if (opts.columns[i]) {
+                    opts.columns[i].title = this.coltitles[i];
+                } else {
+                    opts.columns.push({title:this.coltitles[i]});
+                }
+            }
+        }
+
+        this.table = jexcel(div, opts);
     }
 
     addAutoGradeButton() {
@@ -31,11 +58,12 @@ class SpreadSheet extends RunestoneBase {
         this.gradeButton = butt;
         $(butt).click(this.doAutoGrade.bind(this));
         $(butt).attr("type","button");
+        $(butt).css("display","block");
     }
 
     addOutput() {
         this.output = document.createElement('pre');
-        this.output.id = this.divid+'_stdout';
+        this.output.id = `${this.div_id}_stdout`;
         $(this.output).css("visibility","hidden");
         let div = document.getElementById(this.div_id);
         div.appendChild(this.output);
@@ -62,7 +90,7 @@ class SpreadSheet extends RunestoneBase {
         pct = pct.toLocaleString(undefined, { maximumFractionDigits: 2});
         result += `You passed ${this.passed} out of ${this.passed+this.failed} tests for ${pct}%`;
         this.logBookEvent({event: 'unittest',
-                           div_id: this.divid,
+                           div_id: this.div_id,
                            course: eBookConfig.course,
                            act: `percent:${pct}:passed:${this.passed}:failed:${this.failed}`
                         });

runestone/spreadsheet/spreadsheet.py

@@ -15,7 +15,7 @@
 #
 __author__ = 'bmiller'
 
-import re
+import re, os
 from docutils import nodes
 from docutils.parsers.rst import directives
 from runestone.common.runestonedirective import RunestoneNode, RunestoneIdDirective, get_node_line
@@ -66,7 +66,6 @@ class SpreadSheet(RunestoneIdDirective):
         :fromcsv: path/to/csv/file
         :colwidths: list of column widths
         :coltitles: list of column names
-        :coltypes: list of column types
         :mindimensions: mincols, minrows  -- minDimensions:[10,5]
 
         A1,B1,C1,D1...
@@ -80,7 +79,7 @@ class SpreadSheet(RunestoneIdDirective):
         'fromcsv': directives.unchanged,
         'colwidths': directives.unchanged,
         'coltitles': directives.unchanged,
-        'coltypes': directives.unchanged
+        'mindimensions': directives.unchanged
     })
 
 
@@ -96,18 +95,34 @@ def run(self):
             self.options['asserts'] = suffix
             self.options['autograde'] = 'data-autograde="true"'
         else:
+            self.options['asserts'] = '""'
             self.options['autograde'] = ''
 
         if 'fromcsv' in self.options:
-            self.content = self.body_from_csv(self.options['fromcsv'])
+            self.content = self.body_from_csv(env, self.options['fromcsv'])
         else:
             if self.content:
-                self.content = self.body_to_csv()
+                self.content = self.body_to_csv(self.content)
             else:
                 raise ValueError("You must specify either from csv or provide content in the body")
 
         self.options['data'] = self.content
 
+        if 'coltitles' not in  self.options:
+            self.options['coltitles'] = ""
+        else:
+            self.options['coltitles'] = "data-coltitles=[{}]".format(self.options['coltitles'])
+
+        if 'mindimensions' not in self.options:
+            self.options['mindimensions'] = ""
+        else:
+            self.options['mindimensions'] = "data-mindimensions=[{}]".format(self.options['mindimensions'])
+
+        if 'colwidths' not in self.options:
+            self.options['colwidths'] = ""
+        else:
+            self.options['colwidths'] = "data-colwidths=[{}]".format(self.options['colwidths'])
+
         ssnode = SpreadSheetNode(self.options, rawsource=self.block_text)
         ssnode.source, ssnode.line = self.state_machine.get_source_and_line(self.lineno)
         self.add_name(ssnode)    # make this divid available as a target for :ref:
@@ -116,9 +131,9 @@ def run(self):
 
 
 
-    def body_to_csv(self):
+    def body_to_csv(self, row_list):
         csvlist = []
-        for row in self.content:
+        for row in row_list:
             if re.match(r'^\s*====', row):
                 break
             items = row.split(',')
@@ -134,8 +149,16 @@ def body_to_csv(self):
             csvlist.append(ilist)
         return csvlist
 
-    def body_from_csv(self, csvfile):
-        return "to do"
+    def body_from_csv(self, env, csvfile):
+        ffpath = os.path.dirname(self.srcpath)
+        print(self.srcpath, os.getcwd())
+        filename = os.path.join(env.srcdir, ffpath, csvfile)
+
+        print("\n\nPATH=", self.srcpath)
+        with open(filename,'r') as csv:
+            content = csv.readlines()
+
+        return self.body_to_csv(content)
 
 def is_float(s):
     try:
@@ -154,7 +177,7 @@ def as_int_or_float(s):
 
 
 TEMPLATE = """
-<div id="{divid}" data-component="spreadsheet" class="runestone" {autograde}>
+<div id="{divid}" data-component="spreadsheet" class="runestone" {autograde} {mindimensions} {colwidths} {coltitles}>
     <div id="{divid}_sheet"></div>
 
     <script>

runestone/spreadsheet/test/_sources/Iris.csv

@@ -0,0 +1,151 @@
+Id,SepalLengthCm,SepalWidthCm,PetalLengthCm,PetalWidthCm,
+1,5.1,3.5,1.4,0.2,
+2,4.9,3,1.4,0.2,
+3,4.7,3.2,1.3,0.2,
+4,4.6,3.1,1.5,0.2,
+5,5,3.6,1.4,0.2,
+6,5.4,3.9,1.7,0.4,
+7,4.6,3.4,1.4,0.3,
+8,5,3.4,1.5,0.2,
+9,4.4,2.9,1.4,0.2,
+10,4.9,3.1,1.5,0.1,
+11,5.4,3.7,1.5,0.2,
+12,4.8,3.4,1.6,0.2,
+13,4.8,3,1.4,0.1,
+14,4.3,3,1.1,0.1,
+15,5.8,4,1.2,0.2,
+16,5.7,4.4,1.5,0.4,
+17,5.4,3.9,1.3,0.4,
+18,5.1,3.5,1.4,0.3,
+19,5.7,3.8,1.7,0.3,
+20,5.1,3.8,1.5,0.3,
+21,5.4,3.4,1.7,0.2,
+22,5.1,3.7,1.5,0.4,
+23,4.6,3.6,1,0.2,
+24,5.1,3.3,1.7,0.5,
+25,4.8,3.4,1.9,0.2,
+26,5,3,1.6,0.2,
+27,5,3.4,1.6,0.4,
+28,5.2,3.5,1.5,0.2,
+29,5.2,3.4,1.4,0.2,
+30,4.7,3.2,1.6,0.2,
+31,4.8,3.1,1.6,0.2,
+32,5.4,3.4,1.5,0.4,
+33,5.2,4.1,1.5,0.1,
+34,5.5,4.2,1.4,0.2,
+35,4.9,3.1,1.5,0.1,
+36,5,3.2,1.2,0.2,
+37,5.5,3.5,1.3,0.2,
+38,4.9,3.1,1.5,0.1,
+39,4.4,3,1.3,0.2,
+40,5.1,3.4,1.5,0.2,
+41,5,3.5,1.3,0.3,
+42,4.5,2.3,1.3,0.3,
+43,4.4,3.2,1.3,0.2,
+44,5,3.5,1.6,0.6,
+45,5.1,3.8,1.9,0.4,
+46,4.8,3,1.4,0.3,
+47,5.1,3.8,1.6,0.2,
+48,4.6,3.2,1.4,0.2,
+49,5.3,3.7,1.5,0.2,
+50,5,3.3,1.4,0.2,
+51,7,3.2,4.7,1.4,
+52,6.4,3.2,4.5,1.5,
+53,6.9,3.1,4.9,1.5,
+54,5.5,2.3,4,1.3,
+55,6.5,2.8,4.6,1.5,
+56,5.7,2.8,4.5,1.3,
+57,6.3,3.3,4.7,1.6,
+58,4.9,2.4,3.3,1,
+59,6.6,2.9,4.6,1.3,
+60,5.2,2.7,3.9,1.4,
+61,5,2,3.5,1,
+62,5.9,3,4.2,1.5,
+63,6,2.2,4,1,
+64,6.1,2.9,4.7,1.4,
+65,5.6,2.9,3.6,1.3,
+66,6.7,3.1,4.4,1.4,
+67,5.6,3,4.5,1.5,
+68,5.8,2.7,4.1,1,
+69,6.2,2.2,4.5,1.5,
+70,5.6,2.5,3.9,1.1,
+71,5.9,3.2,4.8,1.8,
+72,6.1,2.8,4,1.3,
+73,6.3,2.5,4.9,1.5,
+74,6.1,2.8,4.7,1.2,
+75,6.4,2.9,4.3,1.3,
+76,6.6,3,4.4,1.4,
+77,6.8,2.8,4.8,1.4,
+78,6.7,3,5,1.7,
+79,6,2.9,4.5,1.5,
+80,5.7,2.6,3.5,1,
+81,5.5,2.4,3.8,1.1,
+82,5.5,2.4,3.7,1,
+83,5.8,2.7,3.9,1.2,
+84,6,2.7,5.1,1.6,
+85,5.4,3,4.5,1.5,
+86,6,3.4,4.5,1.6,
+87,6.7,3.1,4.7,1.5,
+88,6.3,2.3,4.4,1.3,
+89,5.6,3,4.1,1.3,
+90,5.5,2.5,4,1.3,
+91,5.5,2.6,4.4,1.2,
+92,6.1,3,4.6,1.4,
+93,5.8,2.6,4,1.2,
+94,5,2.3,3.3,1,
+95,5.6,2.7,4.2,1.3,
+96,5.7,3,4.2,1.2,
+97,5.7,2.9,4.2,1.3,
+98,6.2,2.9,4.3,1.3,
+99,5.1,2.5,3,1.1,
+100,5.7,2.8,4.1,1.3,
+101,6.3,3.3,6,2.5,
+102,5.8,2.7,5.1,1.9,
+103,7.1,3,5.9,2.1,
+104,6.3,2.9,5.6,1.8,
+105,6.5,3,5.8,2.2,
+106,7.6,3,6.6,2.1,
+107,4.9,2.5,4.5,1.7,
+108,7.3,2.9,6.3,1.8,
+109,6.7,2.5,5.8,1.8,
+110,7.2,3.6,6.1,2.5,
+111,6.5,3.2,5.1,2,
+112,6.4,2.7,5.3,1.9,
+113,6.8,3,5.5,2.1,
+114,5.7,2.5,5,2,
+115,5.8,2.8,5.1,2.4,
+116,6.4,3.2,5.3,2.3,
+117,6.5,3,5.5,1.8,
+118,7.7,3.8,6.7,2.2,
+119,7.7,2.6,6.9,2.3,
+120,6,2.2,5,1.5,
+121,6.9,3.2,5.7,2.3,
+122,5.6,2.8,4.9,2,
+123,7.7,2.8,6.7,2,
+124,6.3,2.7,4.9,1.8,
+125,6.7,3.3,5.7,2.1,
+126,7.2,3.2,6,1.8,
+127,6.2,2.8,4.8,1.8,
+128,6.1,3,4.9,1.8,
+129,6.4,2.8,5.6,2.1,
+130,7.2,3,5.8,1.6,
+131,7.4,2.8,6.1,1.9,
+132,7.9,3.8,6.4,2,
+133,6.4,2.8,5.6,2.2,
+134,6.3,2.8,5.1,1.5,
+135,6.1,2.6,5.6,1.4,
+136,7.7,3,6.1,2.3,
+137,6.3,3.4,5.6,2.4,
+138,6.4,3.1,5.5,1.8,
+139,6,3,4.8,1.8,
+140,6.9,3.1,5.4,2.1,
+141,6.7,3.1,5.6,2.4,
+142,6.9,3.1,5.1,2.3,
+143,5.8,2.7,5.1,1.9,
+144,6.8,3.2,5.9,2.3,
+145,6.7,3.3,5.7,2.5,
+146,6.7,3,5.2,2.3,
+147,6.3,2.5,5,1.9,
+148,6.5,3,5.2,2,
+149,6.2,3.4,5.4,2.3,
+150,5.9,3,5.1,1.8,

runestone/spreadsheet/test/_sources/index.rst

@@ -17,6 +17,9 @@ SECTION 1: Spreadsheets
 :::::::::::::::::::::::
 
 .. spreadsheet:: ss1
+    :mindimensions: 6,5
+    :colwidths: 200,100,100
+    :coltitles: 'name','year','price','foo'
 
     Google, 1998, 807.80
     Apple, 1976, 116.52
@@ -27,3 +30,11 @@ SECTION 1: Spreadsheets
     assert A3 == Yahoo
     assert B3 == 1994
 
+
+.. spreadsheet:: ss2
+    :fromcsv: Iris.csv
+    :colwidths: 50,100,100,100,100
+
+    ====
+    assert A151 == 150
+

runestone/spreadsheet/test/test_spreadsheet.py

@@ -0,0 +1,32 @@
+from selenium.webdriver import ActionChains
+from selenium.webdriver.support import expected_conditions as EC
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.common.by import By
+import time
+from runestone.unittest_base import module_fixture_maker, RunestoneTestCase
+
+setUpModule, tearDownModule = module_fixture_maker(__file__)
+
+
+class SpreadsheetTests(RunestoneTestCase):
+
+    def test_ss_autograde(self):
+        self.driver.get(self.host + "/index.html")
+        t2 = self.driver.find_element_by_id("ss1")
+        self.assertIsNotNone(t2)
+        time.sleep(1)
+        rb = t2.find_element_by_class_name("run-button")
+        self.assertIsNotNone(rb)
+        rb.click()
+        out = self.driver.find_element_by_id("ss1_stdout")
+        self.assertTrue('You passed 2 out of 2 tests' in out.text)
+
+        t2 = self.driver.find_element_by_id("ss2")
+        self.assertIsNotNone(t2)
+        time.sleep(1)
+        rb = t2.find_element_by_class_name("run-button")
+        self.assertIsNotNone(rb)
+        rb.click()
+        out = self.driver.find_element_by_id("ss2_stdout")
+        print(out.text)
+        self.assertTrue('You passed 1 out of 1 tests' in out.text)