소스 검색

Merged in mquezada88/django-hackathon-starter (pull request #32)

corrected  quandl.py
David Leonard 10 년 전
부모
커밋
b274d56cef

+ 11 - 13
hackathon_starter/hackathon/scripts/quandl.py

@@ -2,30 +2,28 @@
 aggregating data from markets throughout the world'''
 
 import requests
-import simplejson as json
-
+import json
 
 def dowjonesIndustrialAvg(apikey):
     '''Returns JSON data of the Dow Jones Average.'''
     parameters = {'rows' : 1, 'auth_token' : apikey}
     apiurl = 'https://www.quandl.com/api/v1/datasets/BCB/UDJIAD1.json?'
-    reap = requests.get(apiurl, params=parameters)
-    desu = json.loads(reap.content)
-    return desu['data']
+    req = requests.get(apiurl, params=parameters)
+    data = json.loads(req.content)
+    return data
 
 def snp500IndexPull(apikey):
     '''Returns JSON data of the S&P 500 Index.'''
     parameters = {'rows' : 1, 'auth_token' : apikey}
     apiurl = 'https://www.quandl.com/api/v1/datasets/YAHOO/INDEX_GSPC.json?'
-    reap = requests.get(apiurl, params=parameters)
-    desu = json.loads(reap.content)
-    return desu['data']
+    req = requests.get(apiurl, params=parameters)
+    data = json.loads(req.content)
+    return data
 
 def nasdaqPull(apikey):
     '''Returns JSON data of the Nasdaq Index.'''
     parameters = {'rows' : 1, 'auth_token' : apikey}
-    apiurl = 'https://www.quandl.com/api/v1/datasets/GOOG/NASDAQ_SWTX.json?'
-    reap = requests.get(apiurl, params=parameters)
-    desu = json.loads(reap.content)
-    return desu['data']
-    
+    apiurl = 'https://www.quandl.com/api/v1/datasets/NASDAQOMX/COMP.json?'
+    req = requests.get(apiurl, params=parameters)
+    data = json.loads(req.content)
+    return data

+ 3 - 1
hackathon_starter/hackathon/templates/hackathon/api_examples.html

@@ -11,7 +11,9 @@
 			<div class="col-sm-4"><a href="http://127.0.0.1:8000/hackathon/linkedin/">LinkedIn Example</a></div>
 		-->
 		<div class="col-sm-4"><a href="http://127.0.0.1:8000/hackathon/twilio/">Twilio Example</a></div>
-		<div class="col-sm-4"><a href="{{instagram_url}}">Instagram Example</a></div>
+		<div class="col-sm-4"><a href="{{instagram_url}}">Instagram Example
+		</a></div>
+		<div class="col-sm-4"><a href="http://localhost:8000/hackathon/quandlstocks/">Quandl Example</a></div>
 
   	</div>
 

+ 37 - 0
hackathon_starter/hackathon/templates/hackathon/quandl.html

@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<body>
+	{% include 'hackathon/base.html' %}
+
+    <h1 class="text-center"> Quandl Collection </h1>
+
+    <h2 class="text-center"> Dow Jones Data </h2>
+	<div class="col-lg-12">
+        <div class="table-responsive">
+            <table class="table table-bordered table-hover table-striped tablesorter">
+                <thead>
+                <tr>
+                <th class="header"> Name <i class="icon-sort"></i></th>
+                <th class="header"> Description <i class="icon-sort"></i></th>
+                <th class="header"> Data <i class="icon-sort"></i></th>
+                <th class="header"> Code <i class="icon-sort"></i></th>  
+                </tr>
+            </thead>
+            <tbody>
+
+            {% for key in data.dowjones %}
+                <tr>
+                    <td>{{ key.name }}</td>
+                    <td>{{ key.description }}</td>
+                    <td>{{ key.data }}</td>
+                    <td>{{ key.code }}</td>
+    	        </tr>
+            {% endfor %}
+
+            </tbody>
+            </table>
+        </div>
+    </div>
+        
+</body>
+</html>

+ 2 - 1
hackathon_starter/hackathon/urls.py

@@ -26,4 +26,5 @@ urlpatterns = patterns('',
     url(r'^quandlSnp500/$', views.quandlSnp500, name='quandlsnp500'),
     url(r'^quandlNasdaq/$', views.quandlNasdaq, name='quandlnasdaq'),
     url(r'^quandlDowJones/$', views.quandlDowJones, name='quandldowjones'),
-)
+    url(r'^quandlstocks/$', views.quandlstocks, name='quandlstocks'),
+)

+ 11 - 0
hackathon_starter/hackathon/views.py

@@ -101,6 +101,17 @@ def quandlNasdaq(request):
     parsedData = nasdaqPull(APIKEY)
     return JsonResponse({'data': parsedData})
 
+def quandlstocks(request):
+    APIKEY = ' fANs6ykrCdAxas7zpMz7'	
+    everyData = {}
+    dowjonesdata = dowjonesIndustrialAvg(APIKEY)
+    snpdata = snp500IndexPull(APIKEY)
+    nasdaqdata = nasdaqPull(APIKEY)
+    everyData['dowjones'] = dowjonesdata
+    everyData['snp'] = snpdata
+    everyData['nasdaq'] = nasdaqdata
+    return render(request, 'hackathon/quandl.html', { 'everyData': everyData })
+
 #################
 #   GITHUB API  #
 #################