Merge pull request #56 from SOCR/dev

chore: Release 0.1.5-alpha.4
#SOCRFW-215

app/partials/analysis/charts/main.jade

@@ -2,4 +2,3 @@ div.container-fluid(ng-controller="mainChartsCtrl")
   h4 {{chartData.name}}
   div.row-fluid
     d3-charts
-      scatter-plot

app/partials/analysis/charts/sidebar.jade

@@ -2,16 +2,16 @@ div(ng-controller="sideChartsCtrl")
   h4 Graphs
   select.form-control#chooseGraph(value="Choose a graph" ng-change="changeName()" ng-model="graphSelect" ng-options="g as g.name for g in graphs")
   h4 Variables
+  div
+    p {{graphSelect.message}}
   div.form-inline
-    div.form-horizontal
+    div.form-horizontal(ng-show="graphSelect.x")
       label(for = "x") Add X
       select#x.form-control(ng-change="changeVar(selector1,headers,'x');" ng-model="selector1" ng-options="v as v.value for v in headers")
-    div.form-horizontal
+    div.form-horizontal(ng-show="graphSelect.y")
       label(for = "y") Add Y
       select#y.form-control(ng-change="changeVar(selector2,headers,'y');" ng-model="selector2" ng-options="v as v.value for v in headers")
-    div.form-horizontal
-      label(for = "z") Add Z
+    div.form-horizontal(ng-show="graphSelect.z")
+      label(for = "z") Add Radius
       select#z.form-control(ng-change="changeVar(selector3,headers,'z');" ng-model="selector3" ng-options="v as v.value for v in headers")
 
-  //add variable options.
-  button.btn.btn-default(ng-click="createGraph()") Graph

app/partials/analysis/getData/main.jade

@@ -1,24 +1,25 @@
 div(ng-controller='getDataMainCtrl')
   h1 Get Data
-  br
+  //br
   p.lead To perform any analysis, you need data to begin with. Choose one of the available methods
     |to get the data into the web-app.
 
   form.socrData(collapse="showState.socrData")
     legend SOCR Datasets
     div.form-group
-      select(ng-model="socrdataset",\
-        ng-options="item as item.name for item in socrDatasets track by item.id").form-control
-    button.btn.btn-medium(ng-click="getSocrData()") Load
+      select.form-control(
+        ng-model="socrdataset",
+        ng-options="item as item.name for item in socrDatasets track by item.id")
+    button.btn.btn-primary(ng-click="getSocrData()") Load
 
   div.worldBank(collapse="showState.worldBank")
     h3 WorldBank Data
     span Size:
-      input(type="text",class="input-mini",ng-model="size")
-      select(style="width:100%;margin:0px",ng-model="option")
+      input(type="text",class="input-mini", ng-model="size")
+      select(style="width:100%;margin:0px", ng-model="option")
         option(value='4.2_BASIC.EDU.SPENDING') Education Spending
         option(value='2.4_OOSC.RATE') Out of School Children rate
-      button.btn.btn-medium(ng-click="getWB()") Go
+      button.btn.btn-primary(ng-click="getWB()") Load
 
   div.generate(collapse="showState.generate")
     ul.nav.nav-pills.nav-stacked
@@ -33,6 +34,7 @@ div(ng-controller='getDataMainCtrl')
       li
         a The Beta Distribution Experiment
 
+  br
   handsontable(purpose="json")
 
 

app/partials/analysis/getData/sidebar.jade

@@ -1,26 +1,31 @@
 div(ng-controller="getDataSidebarCtrl")
-  span Traditional spreadsheet where you can copy-paste your data and edit it as you like!
-  button.btn.btn-info.btn-sm(ng-click="show('grid')") Show
-  hr
-  span Use one of the predefined SOCR datasets.
-  button.btn.btn-info.btn-sm(ng-click="show('socrData')") Use
-  hr
-  span Use the exhaustive WorldBank data to fuel your analysis.
-  button.btn.btn-info.btn-sm(ng-click="show('worldBank')") Use
-  hr
-  span Use the inbuilt experiment to generate data for your analysis.
-  button.btn.btn-info.btn-sm(ng-click="show('generate')") Generate
-  hr
-  span Enter JSON URL here to parse
-  input(ng-model="jsonUrl",type="text",
-  tooltip="Enter url here...",tooltip-trigger="focus",
-  tooltip-placement="right").input-medium
-  button.btn.btn-info.btn-sm(ng-click="getJson()") Use
-  hr
-  span Enter SOCR Data url here. We will parse it for you!
-  input(type="url",ng-model="socrUrl").input-medium
-  div
-      button.btn.btn-success.btn-sm(ng-click="save()") SAVE
+  p. Data input
+  div.list-group
+    a#getDataGrid.list-group-item(
+      href="#"
+      ng-click="show('grid')"
+      ng-class="{active:selected == 'getDataGrid'}")
+      | Copy-paste to spreadsheet
+    a#getDataSocrData.list-group-item(
+      href="#"
+      ng-click="show('socrData')"
+      ng-class="{active:selected == 'getDataSocrData'}")
+      | Load SOCR dataset
+    a#getDataWorldBank.list-group-item(
+      href="#"
+      ng-click="show('worldBank')"
+      ng-class="{active:selected == 'getDataWorldBank'}")
+      | Load data from WorldBank
+    a#getDataGenerate.list-group-item.disabled(
+      href="#"
+      ng-click="show('generate')"
+      ng-class="{active:selected == 'getDataGenerate'}")
+      | Use data generator
+    a.list-group-item.disabled(href="#", ng-click="getJson()", ng-class="{active:selected == 'getDataJson'}")
+      | Parse JSON fileParse SOCR Data page
+    a.list-group-item.disabled(href="#", ng-click="save()", ng-class="{active:selected == 'getDataSocrPage'}")
+      | Parse SOCR Data page
+
 //
   accordion(close-others="true")
     accordion-group(heading="Grid")

app/partials/analysis/tools/machineLearning/kMeans/sidebar.jade

@@ -1,6 +1,10 @@
 div(ng-controller="kMeansSidebarCtrl")
   form
     legend Parameters
+    div.checkbox
+      label
+        input(type="checkbox", ng-model="wholedataseton")
+        | Cluster whole dataset (visualize 2D projection)
     div.form-group
       label X column  
       //- show data header column names
@@ -9,23 +13,41 @@ div(ng-controller="kMeansSidebarCtrl")
       label Y column  
       //- show data header column names
       select(ng-model="yCol", ng-options="col for col in cols").form-control
-    div.checkbox
-      label
-        input(type="checkbox", ng-model="labelson")
-        | Use labels column
     div.form-group
       fieldset(ng-disabled="!labelson")
         label Labels column  
         //- show data header column names
         select(ng-model="labelCol", ng-options="col for col in cols").form-control
+    div.checkbox
+      label
+        input(type="checkbox", ng-model="labelson")
+        | Labels present
     div.form-group
       label k  
       select(ng-model="k", ng-options="k for k in ks").form-control
+    div.checkbox(ng-hide="!labelson")
+      label
+        input(
+        type="checkbox"
+        ng-model="accuracyon"
+        ng-disabled="k !== numUniqueLabels.num || labelCol !== numUniqueLabels.labelCol")
+        | Compute accuracy
     div.form-group
       label Distance  
       select(ng-model="dist", ng-options="dist for dist in distances").form-control
     div.form-group
       label Initialization  
       select(ng-model="initMethod", ng-options="init for init in inits").form-control
-    button(type="submit", aria-label="Run k-Means", ng-click="run()", ng-disabled="kmeanson").btn.btn-primary Run 
+    button.btn.btn-info(
+      type="submit"
+      aria-label="Get k value"
+      ng-click="detectKValue()"
+      ng-disabled="!labelson")
+      | Detect k
+    button.btn.btn-primary(
+      type="submit"
+      aria-label="Run k-Means"
+      ng-click="run()"
+      ng-disabled="kmeanson")
+      | Run 
       span.glyphicon.glyphicon-refresh(aria-hidden="true", ng-class="running")

app/partials/footer.jade

@@ -1,4 +1,4 @@
 footer.navbar.navbar-default.navbar-fixed-bottom
   .container
     p
-      a(href='http://socr.umich.edu/') The Statistics Online Computational Resource (SOCR), 2012-2015
+      a(href='http://socr.umich.edu/') The Statistics Online Computational Resource (SOCR), 2012-2016

app/partials/nav/home.jade

@@ -1,3 +1,6 @@
 div
-  h2 Welcome {{username}}!
-  p.lead Start from getting data, and continue through wrangling to analysis and charting.
+  h2 Welcome!
+  p.lead Start with getting data at
+    mark Raw Data
+    |  tab in main menu.
+    | Continue through wrangling to analysis and charting.