From 439a94c0ea32b2171ff0f0976f40f40276922989 Mon Sep 17 00:00:00 2001 From: vaishnaviajmera22 Date: Fri, 1 Jun 2018 12:16:09 +0530 Subject: [PATCH 1/5] The Function --- nearby.py | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 nearby.py diff --git a/nearby.py b/nearby.py new file mode 100644 index 0000000..3ec026c --- /dev/null +++ b/nearby.py @@ -0,0 +1,56 @@ +import requests + +#now 2 tasks + +# 1 change the whole program to Object oriented style +# e.g. a = GoogleMapPlaces("Chittorgarh", "1500", "Pizza", "") should create object +# a.getNearByAddress() should give result + + +# 2 Get your own API Key from google cloud console +# open terminal arey baba yaha pr +class GoogleMapPlaces: + API_KEY = "AIzaSyDZMs9AfgNI0fcvENgUK6pM6lS3wbptcbE" + + def __init__(self, address, radius, type, keyword): + self.address = address + self.radius = radius + self.type = type + self.keyword = keyword + + + def addressToCoordinates(self): + url = "https://maps.googleapis.com/maps/api/geocode/json" + + querystring = {"address":self.address,"key":self.API_KEY} + + + response = requests.request("GET", url, params=querystring) + + # check if response is 'ok' then return result + if response.json()["status"]=="OK": + return response.json()["results"][0]["geometry"]["location"] + else: + print(response.text) + return { "error": "Not found"} + + def getNearBy(self): + location = self.addressToCoordinates() + x= location["lat"] + y= location["lng"] + loc=str(x)+","+str(y) + url = "https://maps.googleapis.com/maps/api/place/nearbysearch/json" + + querystring = {"location":loc,"radius":self.radius,"type":self.type,"keyword":self.keyword,"key":self.API_KEY} + + response = requests.request("GET", url, params=querystring) + print(response.text) + return response.json() + + def getNearByAddress(self): + r = self.getNearBy() + for x in r["results"]: + print(x["name"]+" "+x.get("vicinity", "")) + +a = GoogleMapPlaces("Chittorgarh", "1500", "restaurant", "pizza") +a.getNearByAddress() From 47d19eb2af40e6cecfb821ca7ba8db6c69aae27c Mon Sep 17 00:00:00 2001 From: vaishnaviajmera22 Date: Sat, 2 Jun 2018 17:33:38 +0530 Subject: [PATCH 2/5] Google Maps Nearby Implementation --- nearby.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/nearby.py b/nearby.py index 3ec026c..79ece8a 100644 --- a/nearby.py +++ b/nearby.py @@ -44,13 +44,9 @@ def getNearBy(self): querystring = {"location":loc,"radius":self.radius,"type":self.type,"keyword":self.keyword,"key":self.API_KEY} response = requests.request("GET", url, params=querystring) - print(response.text) return response.json() def getNearByAddress(self): r = self.getNearBy() for x in r["results"]: print(x["name"]+" "+x.get("vicinity", "")) - -a = GoogleMapPlaces("Chittorgarh", "1500", "restaurant", "pizza") -a.getNearByAddress() From 16bb090a1985fd803c1b34d210d5e47be52134cc Mon Sep 17 00:00:00 2001 From: vaishnaviajmera22 Date: Mon, 4 Jun 2018 11:54:19 +0530 Subject: [PATCH 3/5] CSV Practice --- csvtry.py | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 csvtry.py diff --git a/csvtry.py b/csvtry.py new file mode 100644 index 0000000..b7ce4bd --- /dev/null +++ b/csvtry.py @@ -0,0 +1,53 @@ +import csv + +fields = ['Name', 'Branch', 'Year', 'CGPA'] + +# data rows of csv file +rows = [ ['Nikhil', 'COE', '2', '9.0'], + ['Sanchit', 'COE', '2', '9.1'], + ['Aditya', 'IT', '2', '9.3'], + ['Sagar', 'SE', '1', '9.5'], + ['Prateek', 'MCE', '3', '7.8'], + ['Sahil', 'EP', '2', '9.1']] + +# name of csv file +filename = "university_records.csv" + +# writing to csv file +with open(filename, 'w') as csvfile: + # creating a csv writer object + csvwriter = csv.writer(csvfile) + + # writing the fields + csvwriter.writerow(fields) + + # writing the data rows + csvwriter.writerows(rows) + + +fields = [] +rows = [] + +# reading csv file +with open(filename, 'r') as csvfile: + # creating a csv reader object + csvreader = csv.reader(csvfile) + + # extracting field names through first row + fields = next(csvreader) + # extracting each data row one by one + for row in csvreader: + rows.append(row) + + # get total number of rows + print("Total no. of rows: %d"%(csvreader.line_num)) + +# printing the field names +print('Field names are:\n' + ' '.join(field for field in fields)) + + +for row in rows[:5]: + # parsing each column of a row + for col in row: + print("%10s"%col) + print('\n') From 9f2a3504cd170a876abfb6996548058cc571e96a Mon Sep 17 00:00:00 2001 From: vaishnaviajmera22 Date: Mon, 25 Jun 2018 10:19:14 +0530 Subject: [PATCH 4/5] the created API --- src/proj/proj/settings.py | 2 ++ src/proj/proj/urls.py | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/proj/proj/settings.py b/src/proj/proj/settings.py index 5b8f448..b4989ab 100644 --- a/src/proj/proj/settings.py +++ b/src/proj/proj/settings.py @@ -38,6 +38,8 @@ 'django.contrib.messages', 'django.contrib.staticfiles', 'r3po', + 'rest_framework', + 'webapp' ] MIDDLEWARE = [ diff --git a/src/proj/proj/urls.py b/src/proj/proj/urls.py index 248ad04..facf502 100644 --- a/src/proj/proj/urls.py +++ b/src/proj/proj/urls.py @@ -15,7 +15,10 @@ """ from django.conf.urls import url from django.contrib import admin +from rest_framework.urlpatterns import format_suffix_patterns +from webapp import views urlpatterns = [ url(r'^admin/', admin.site.urls), + url(r'^Product/', views.productList.as_view()), ] From beb9ec6e4cefd92d8e9415be45c30cfd0c8e2749 Mon Sep 17 00:00:00 2001 From: vaishnaviajmera22 Date: Tue, 26 Jun 2018 18:15:51 +0530 Subject: [PATCH 5/5] the webapp --- src/proj/webapp/__init__.py | 0 src/proj/webapp/admin.py | 6 ++++++ src/proj/webapp/apps.py | 5 +++++ src/proj/webapp/migrations/0001_initial.py | 24 ++++++++++++++++++++++ src/proj/webapp/migrations/__init__.py | 0 src/proj/webapp/models.py | 12 +++++++++++ src/proj/webapp/serializers.py | 8 ++++++++ src/proj/webapp/tests.py | 3 +++ src/proj/webapp/views.py | 20 ++++++++++++++++++ 9 files changed, 78 insertions(+) create mode 100644 src/proj/webapp/__init__.py create mode 100644 src/proj/webapp/admin.py create mode 100644 src/proj/webapp/apps.py create mode 100644 src/proj/webapp/migrations/0001_initial.py create mode 100644 src/proj/webapp/migrations/__init__.py create mode 100644 src/proj/webapp/models.py create mode 100644 src/proj/webapp/serializers.py create mode 100644 src/proj/webapp/tests.py create mode 100644 src/proj/webapp/views.py diff --git a/src/proj/webapp/__init__.py b/src/proj/webapp/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/proj/webapp/admin.py b/src/proj/webapp/admin.py new file mode 100644 index 0000000..42b6f2e --- /dev/null +++ b/src/proj/webapp/admin.py @@ -0,0 +1,6 @@ +from django.contrib import admin +from . models import Product + +# Register your models here. +admin.site.register(Product) + diff --git a/src/proj/webapp/apps.py b/src/proj/webapp/apps.py new file mode 100644 index 0000000..fcacfff --- /dev/null +++ b/src/proj/webapp/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class WebappConfig(AppConfig): + name = 'webapp' diff --git a/src/proj/webapp/migrations/0001_initial.py b/src/proj/webapp/migrations/0001_initial.py new file mode 100644 index 0000000..9af2369 --- /dev/null +++ b/src/proj/webapp/migrations/0001_initial.py @@ -0,0 +1,24 @@ +# Generated by Django 2.0.4 on 2018-06-24 04:57 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Product', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('product_id', models.IntegerField(null=True)), + ('name', models.CharField(max_length=5000, null=True)), + ('mrp', models.CharField(max_length=10, null=True)), + ('discountprice', models.CharField(max_length=10, null=True)), + ], + ), + ] diff --git a/src/proj/webapp/migrations/__init__.py b/src/proj/webapp/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/proj/webapp/models.py b/src/proj/webapp/models.py new file mode 100644 index 0000000..2dee345 --- /dev/null +++ b/src/proj/webapp/models.py @@ -0,0 +1,12 @@ +from django.db import models +from django.contrib.postgres import fields as pg + +# Create your models here. +class Product(models.Model): + product_id = models.IntegerField(null=True) + name = models.CharField(max_length=5000, null=True) + mrp = models.CharField(max_length=10,null=True) + discountprice = models.CharField(max_length=10,null=True) + + def __str__(self): + return self.name diff --git a/src/proj/webapp/serializers.py b/src/proj/webapp/serializers.py new file mode 100644 index 0000000..1d9a4a9 --- /dev/null +++ b/src/proj/webapp/serializers.py @@ -0,0 +1,8 @@ +from rest_framework import serializers +from . models import Product + +class ProductSerializer(serializers.ModelSerializer): + + class Meta: + model = Product + fields = '__all__' diff --git a/src/proj/webapp/tests.py b/src/proj/webapp/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/src/proj/webapp/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/src/proj/webapp/views.py b/src/proj/webapp/views.py new file mode 100644 index 0000000..cb5278a --- /dev/null +++ b/src/proj/webapp/views.py @@ -0,0 +1,20 @@ +from django.shortcuts import render + +# Create your views here. +from django.http import HttpResponse +from django.shortcuts import get_object_or_404 +from rest_framework.views import APIView +from rest_framework.response import Response +from rest_framework import status +from . models import Product +from . serializers import ProductSerializer + +class productList(APIView): + + def get(self, request): + product1 = Product.objects.all() + serializer = ProductSerializer(product1, many = True) + return Response(serializer.data) + + def post(self): + pass