added line chart

mychapati · Sep 1, 2013 · 0060e28 · 0060e28
2 parents 2b58e25 + 0da5668
commit 0060e28
Show file tree

Hide file tree

Showing 6 changed files with 92 additions and 24 deletions.
diff --git a/analyze.php b/analyze.php
@@ -18,7 +18,7 @@
     include_once("./visual_analytics.php");
 } else {
     include_once("./upload_data.php");
-    include_once("./footer.php");
+
 }
 
 ?>

diff --git a/data-quality.css b/data-quality.css
@@ -372,7 +372,7 @@ a[data-toggle="dropdown"] {
     color: #444;
 }
 .container.upload {
-    margin-top: 7px;
+    margin-top: 20px;
 }
 .row.call-to-action {
     padding:0px;
@@ -882,4 +882,4 @@ div.modal-body input.input-block-level {
 #suggestionsBanner #suggestionsTitle {
     font-size: 13px;
     font-weight: 600;
-}
+}
diff --git a/footer.php b/footer.php
@@ -7,8 +7,6 @@
 						    <li><a href="index.php">Home</a></li>	
 						    <li><a href="gallery.php">Gallery</a></li>	
 							<li><a href="analyze.php">Analyze</a></li>
-							<li><a href="plans.php">Pricing</a></li>
-							<li><a href="blog.php">Blog</a></li>
 							<li><a href="javascript:void(0)" data-uv-lightbox="classic_widget" data-uv-mode="full" data-uv-primary-color="#cc6d00" data-uv-link-color="#007dbf" data-uv-default-mode="feedback" data-uv-forum-id="216045">Feedback</a></li>		
 						
 					</ul>

diff --git a/header_menu.php b/header_menu.php
@@ -18,12 +18,9 @@
 					<div class="nav-collapse">
 						<ul class="nav" id="top-bar-menu">
 							<li><a href="index.php">Home</a></li>	
-							<li><a href="gallery.php">Gallery</a></li>
 							<li><a href="analyze.php">Analyze</a></li>
-							<li><a href="plans.php">Pricing</a></li>
 							<li><a href="javascript:void(0)" data-uv-lightbox="classic_widget" data-uv-mode="full" data-uv-primary-color="#cc6d00" data-uv-link-color="#007dbf" data-uv-default-mode="feedback" data-uv-forum-id="216045">Feedback</a></li>
-							<li><a href="blog.php">Blog</a></li>
-							<li><a href="analyze.php" id="free-trial-header-menu">FREE TRIAL</a></li>
+							<li><a href="analyze.php" id="free-trial-header-menu">Try it now!</a></li>
 						</ul>
 						
 					</div><!--/.nav-collapse -->

diff --git a/upload_data.php b/upload_data.php
@@ -1,3 +1,35 @@
+
+
+<style type="text/css">
+.upload {
+
+  margin-top: 10px;
+
+}
+h3  {
+text-align: left;
+
+}
+
+ul {
+  list-style-type:circle;
+
+}
+li {
+    margin-top:5px;
+    font-size: 18px;
+    text-align: left;
+}
+
+#demo-dataset{
+
+   width: 75%;
+    margin: 0 auto;
+
+}
+
+
+</style>
 <script src="./libs/dropzone/dropzone.min.js"></script>
 <script type="text/javascript">
 function sumbitForm()
@@ -22,7 +54,7 @@ function sumbitForm()
 
   <div class="span6" align="center"><form action="upload.php" class="dropzone" id="my-dropzone" ></form> </div>
   <div class="span6" align="center">
-    <textarea rows="17" cols="10" id="pasted_data_temp" name="pasted_data_temp" placeholder="Paste some data from excel etc (needs to be tab delimited)"></textarea>  
+    <textarea rows="17" cols="10" id="pasted_data_temp" name="pasted_data_temp" placeholder="Paste data (needs to be tabs delimited)"></textarea>  
   </div>
   </div>
   <div class="row-fluid">
@@ -31,8 +63,19 @@ function sumbitForm()
       <input type="hidden" id="file_name" name="file_name" value="" />
       <input type="hidden" id="pasted_data" name="pasted_data" value="" />
       <a class="btn btn-large btn-primary" href="#" onclick="javascript:sumbitForm();" style="font-size: 30px;">
-  <i class="icon-bar-chart"></i> Create dashboard</a>
+  <i class="icon-bar-chart"></i> Load data</a>
       </form>
+    <div id="demo-dataset">
+      <h3>No data at hand? Start with one of our demo dataset:</h3>
+      <p >
+      <ul>
+        <li><a href="">Market share for mobile carriers in South Africa </a> (figure out who's winning)</li>
+        <li><a href="">US census data </a> (find out what's driving people income)</li>
+        <li><a href="">30 years of NBA MVP awards </a> (compare players)</li>
+      </ul>
+
+      </p>
+    </div>
   </div>
 
 </div>

diff --git a/visual_analytics.php b/visual_analytics.php
@@ -881,7 +881,7 @@ function defineTransformation(){
                   tag_id: 'apply-type-on-variable' ,
                   applyTo: ["column","columns"],
                   writeALog: function(args) { return $('#stepsList').append('<div class="step" action="' + this.tag_id +'">Convert column <span args="selectedVariable">' + args.selectedVariable + '</span>  type to <span args="newType">' + args.newType + '</span></div>');},
-                  html: function() { return '<div class="suggestion" action="' + this.tag_id +'"><a href="#">Convert to </a><select class="type" args="newType"><option selected="selected">number</option><option></option><option>string</option><option>date</option></select></div>'},                    
+                  html: function() { return '<div class="suggestion" action="' + this.tag_id +'"><a href="#">Convert to </a><select class="type" args="newType"><option selected="selected">number</option><option>string</option><option>date</option></select></div>'},                    
                   action: function(args){
 
                    var newType = args.newType;
@@ -1368,6 +1368,14 @@ function addDCRowChart(name,nbBins,dimension,group,w, gridster_min_height){
 
           function addDCLineChart(name,dimension,group,w,h){
 
+              var leftBound = dimension.bottom(1)[0][name] - 0;
+              var rightBound = dimension.top(1)[0][name] - 0;
+              var diff = (rightBound - leftBound) * 0.05;
+              leftBound = leftBound - diff;
+              rightBound = rightBound + diff;
+              leftBound = new Date(leftBound);
+              rightBound = new Date(rightBound);
+              /*
               var chart = dc.barChart("#" + name + "-chart");
              chart.width(w)
                   .height(h)
@@ -1379,11 +1387,27 @@ function addDCLineChart(name,dimension,group,w,h){
                   .dimension(dimension)
                   .group(group)
                   .elasticY(true)
-                  .x(d3.time.scale().domain([dimension.bottom(1)[0][name], dimension.top(1)[0][name]]))
+                  .x(d3.time.scale().domain([leftBound, rightBound]))
                   .renderHorizontalGridLines(true)
-                  .xAxis();
-
-                 return chart;    
+                  .xAxis();*/
+              var chart = dc.lineChart("#" + name + "-chart");
+              chart.width(w)
+                .height(h)
+                .margins({
+                      top: 5,
+                      right: 10,
+                      bottom: 25,
+                      left: 35})
+                .dimension(dimension)
+                .group(group)
+                .x(d3.time.scale().domain([leftBound, rightBound]))
+                .renderHorizontalGridLines(true)
+                .elasticY(true)
+                .brushOn(true)
+                .xAxis();
+
+                 return chart;   
+
           }
 
             /*
@@ -1666,7 +1690,9 @@ function updateSuggestionsList(aSlickRange ){ //update the list of suggestion ba
                 }
                } else if(selectedColumns.length > 0) {
                   keepSuggestionApplyingTo = selectedColumns.length == 1 ? "column" : "columns"; 
-               }  
+               } else if(selectedRows.length >= 1) {
+                   keepSuggestionApplyingTo = selectedRows.length == 1 ? "row" : "rows";
+               }
                //console.log("Suggestions for : "+keepSuggestionApplyingTo);
 
 
@@ -1835,6 +1861,15 @@ function getSelectionText() {
                return text;
             }
 
+            function selectAllRows() {
+              var rowsToSelect = [];
+              for(var i = 0, len = dataView.getLength(); i < len; i++) {
+                rowsToSelect.push(i);
+              }
+
+              slickGrid.setSelectedRows(rowsToSelect);
+            }
+
             function addSlickGrid(someDataset) {
 
               var options = {
@@ -1948,6 +1983,7 @@ function addSlickGrid(someDataset) {
                           break;
                       case "filter-issues-in-columns":
                           refreshData();
+                          //selectAllRows();
                           break;
                   }
               });
@@ -2013,13 +2049,7 @@ function removeHighlightOnColumns() {
                 previousColumns = _.map(slickGrid.getColumns(), function(element) { var x = {}; x[element.id] = {type:element.type, name:element.name}; return x; } );
 
                 shortcut.add("Ctrl+A",function() {
-                  var rowsToSelect = [];
-                  for(var i = 0, len = dataView.getLength(); i < len; i++) {
-                    rowsToSelect.push(i);
-                  }
-
-                  slickGrid.setSelectedRows(rowsToSelect);
-
+                  selectAllRows();
                 },{'target':'myGrid'});
 
                 shortcut.add("Shift+Delete",function() {