ソースを参照

Working on fixing quandl display data

David Leonard 10 年 前
コミット
c3e7f5122f

+ 9 - 1
hackathon_starter/hackathon/scripts/quandl.py

@@ -10,7 +10,15 @@ def dowjonesIndustrialAvg(apikey):
     apiurl = 'https://www.quandl.com/api/v1/datasets/BCB/UDJIAD1.json?'
     apiurl = 'https://www.quandl.com/api/v1/datasets/BCB/UDJIAD1.json?'
     req = requests.get(apiurl, params=parameters)
     req = requests.get(apiurl, params=parameters)
     data = json.loads(req.content)
     data = json.loads(req.content)
-    return data
+    parsedData = []
+    stockData = {}
+    for datum in data:
+        stockData['name'] = data['name']
+        stockData['description'] = data['description']
+        stockData['data'] = data['data']
+        stockData['code'] = data['code']
+    parsedData.append(stockData)
+    return parsedData
 
 
 def snp500IndexPull(apikey):
 def snp500IndexPull(apikey):
     '''Returns JSON data of the S&P 500 Index.'''
     '''Returns JSON data of the S&P 500 Index.'''

+ 6 - 8
hackathon_starter/hackathon/templates/hackathon/quandl.html

@@ -4,7 +4,6 @@
 	{% include 'hackathon/base.html' %}
 	{% include 'hackathon/base.html' %}
 
 
     <h1 class="text-center"> Quandl Collection </h1>
     <h1 class="text-center"> Quandl Collection </h1>
-
     <h2 class="text-center"> Dow Jones Data </h2>
     <h2 class="text-center"> Dow Jones Data </h2>
 	<div class="col-lg-12">
 	<div class="col-lg-12">
         <div class="table-responsive">
         <div class="table-responsive">
@@ -19,15 +18,14 @@
             </thead>
             </thead>
             <tbody>
             <tbody>
 
 
-            {% for key in data.dowjones %}
+            {% for data in everyData.dow %}
                 <tr>
                 <tr>
-                    <td>{{ key.name }}</td>
-                    <td>{{ key.description }}</td>
-                    <td>{{ key.data }}</td>
-                    <td>{{ key.code }}</td>
-    	        </tr>
+                    <td>{{ data.name }}</td>
+                    <td>{{ data.description }}</td>
+                    <td>{{ data.data }}</td>
+                    <td>{{ data.code }}</td>
+                </tr>
             {% endfor %}
             {% endfor %}
-
             </tbody>
             </tbody>
             </table>
             </table>
         </div>
         </div>

+ 10 - 6
hackathon_starter/hackathon/views.py

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