From d27418461c7cff011dd1497d99ad0386c4207ebb Mon Sep 17 00:00:00 2001 From: HarpinderJotSingh Date: Thu, 11 Jul 2019 09:31:33 +0530 Subject: [PATCH] Fixed minor bugs and is up to date now --- myproject/db.sqlite3 | Bin 155648 -> 155648 bytes .../myapp/__pycache__/admin.cpython-36.pyc | Bin 288 -> 305 bytes myproject/myapp/admin.py | 5 +- myproject/myapp/templates/home.html | 129 +++++++----------- myproject/static/js/calc.js | 63 +++++++-- myproject/static/js/script.js | 63 ++++++++- 6 files changed, 159 insertions(+), 101 deletions(-) diff --git a/myproject/db.sqlite3 b/myproject/db.sqlite3 index f48c04fc170f068a2f8a6a4b869d1412b64c692b..28204eb06e4bb16ad4a97889b4d86a7fbbc2bec4 100644 GIT binary patch delta 866 zcmah{O-vI}5blDdEp*?LNPkK45(^38z=6q}X1~go|xSp9yrcg=ek8j;z*!0E#V@LoytR|Y6+oH{SHRXrlD4%6uP!grm`0gG&a3$X>@Aj;n66ZRyd$Zo z1u>RHvvKOa9O_SJlvr$VV&LAGK1nT5@ew-Ed!iCCrz#nS^D*dQHkT0-YBE(ggF(C- zaUR4W<2HFrq%!luLNs$HH)q_um*ZKsQhfQ80A{#tfx{Dt;Rdm@#UooQKB3(j1& m(3NqyI>v@NYm}V@SI2xT=ghbq{#vFZRm|5y)lgsE2giSFSp&rY delta 361 zcmZoTz}awsbAmKu_Cy(H#_Wv=QTlAW;;hWZjMG0lF$!TLGBUO@G}1FPGcmU`-^`cwja7)9?;ityF8>|=?flC89(@1!Cv9we z!Kb3a?8`{dV5Ry;0z53d5e)o6e9QP4cq2A8dhl+Jn9I*7XbiK>P|w`l#L&`UbH%(K zMlKfqYYhAk`9JYr+bpnPJO9K9g3Z^~Z@;#lQO`k$onM22{}KOT{w4ga{Av8|{2Ch@ zh4`m){%7RD;`;4w{~7liaP!N6%v;Sb!|%4Sk%ymCgOiPcmzU9>XL^7=llU}yCa&#n I_Ds7J0BAjFJ^%m! diff --git a/myproject/myapp/__pycache__/admin.cpython-36.pyc b/myproject/myapp/__pycache__/admin.cpython-36.pyc index 12484779315b0c44ef4e11c67a0ab80e1f62cec7..dc9ec83e5a156cfc5587a33d548e4065692f33a4 100644 GIT binary patch delta 216 zcmZ3$w2`Uan3tD}H%cb<7y|>tV<3hDCLqfJh>Hz?L<&O+V-78D9TUE%t`gkOUu6{R-9Opnv(-m m<(pcPn37nM=mwN3Udd3z0koxvW8#qzE;b;GhmnJchYLZAL<&O+V-7>xSziI+n-Kni#m1(*Pw{37xI diff --git a/myproject/myapp/admin.py b/myproject/myapp/admin.py index 2c25380..da81ab2 100644 --- a/myproject/myapp/admin.py +++ b/myproject/myapp/admin.py @@ -1,5 +1,6 @@ # Register your models here. from django.contrib import admin -from myapp.models import UserProfileInfo, User +from myapp.models import * # Register your models here. -admin.site.register(UserProfileInfo) \ No newline at end of file +admin.site.register(UserProfileInfo) +admin.site.register(satelliteMetadataFiles) \ No newline at end of file diff --git a/myproject/myapp/templates/home.html b/myproject/myapp/templates/home.html index 859659a..e427ecc 100644 --- a/myproject/myapp/templates/home.html +++ b/myproject/myapp/templates/home.html @@ -7,21 +7,28 @@ - + + - + + + - + - - - + + + + + + + - + \ No newline at end of file diff --git a/myproject/static/js/calc.js b/myproject/static/js/calc.js index 9382a76..1035b3e 100644 --- a/myproject/static/js/calc.js +++ b/myproject/static/js/calc.js @@ -1,4 +1,13 @@ -function addChar(input, character) { +//================================================== changes ====================================================== +function clearCalcScreen() +{ + document.getElementById('display').value=''; +} +//================================================== changes ====================================================== +function addChar(character) { //================================================== changes ====================================================== + //================================================== changes ====================================================== + let input = document.getElementById('display'); + //================================================== changes ====================================================== if(input.value == null || input.value == "enter") input.value = character else{ @@ -9,53 +18,70 @@ function addChar(input, character) { } } -function deleteChar(input) { +function deleteChar() {//================================================== changes ====================================================== + //================================================== changes ====================================================== + let input = document.getElementById('display'); + //================================================== changes ====================================================== input.value = input.value.substring(0, input.value.length - 1) } -function cos(input) { +function cos() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='cos(' else input.value =input.value +'cos(' } -function sin(input) { +function sin() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='sin(' else input.value =input.value +'sin(' } -function tan(input) { +function tan() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='tan(' else input.value =input.value +'tan(' } -function sqrt(input) { +function sqrt() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='sqrt(' else input.value =input.value +'sqrt(' } -function log(input) { +function log() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='log(' else input.value =input.value +'log(' } -function exp(input) { +function exp() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='exp(' else input.value =input.value +'exp(' } -function power(input) { +function power() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='pow(' else @@ -64,28 +90,37 @@ function power(input) { -function pi(input){ +function pi() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='PI' else input.value =input.value +'PI'} -function ceil(input){ +function ceil() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='ceil(' else input.value =input.value +'ceil('} -function floor(input){ +function floor() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); if(input.value=="enter") input.value='floor(' else input.value =input.value +'floor('} -function percent(input){ - input.value=input.value + '%(';} +function percent() { + //================================================== changes ====================================================== + let input = document.getElementById('display'); + input.value=input.value + '%('; +} diff --git a/myproject/static/js/script.js b/myproject/static/js/script.js index e1e2b9e..ddd0217 100644 --- a/myproject/static/js/script.js +++ b/myproject/static/js/script.js @@ -1,3 +1,7 @@ +//================================================== changes ====================================================== +let map = L.map("map").setView([39.8, -98.5], 6); +//================================================== changes ====================================================== + /*jshint esversion: 6 */ /** * This function is used to get cookie so that csrf token can be set while sending request to backend @@ -290,7 +294,7 @@ function getIndices(){ function initializeLeaflet() { // initialize the map - let map = L.map("map").setView([39.8, -98.5], 6); + let CDB_URL = 'http://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png'; let thirdLayer = new L.tileLayer(CDB_URL); let MyBingMapsKey = "ApDp98sLLH6Lggj-ExrPosLg8IDo0exkQYMu6qU41XgOMheh1NDWyd1HHzyVbny9"; @@ -304,7 +308,7 @@ function initializeLeaflet() }; L.control.layers(baseLayers).addTo(map); - let searchControl = new L.esri.Controls.Geosearch().addTo(map); + // let searchControl = new L.esri.Controls.Geosearch().addTo(map); map.pm.addControls({ position: "topleft", @@ -451,4 +455,57 @@ function initializeLeaflet() function onLayerAdd(e){ radlayerGroup.bringToFront(); } -} \ No newline at end of file +} + + +//================================================== changes ====================================================== + +function showFootprints() +{ + footPrintsArr = [] + sendRequest("/myapp/getFootprints/","GET") + .then(function (response) { + response = JSON.parse(response); + console.log(response); + var arr = response.dict; + var exteriorStyle = { + "color": 'black', + "weight": 0, + "fillOpacity": 0.05 + }; + for(let i=0; i