bradybod-usu/cs2610hw7
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed little bug

Browse Source
This commit is contained in:
bradybodily
2018-04-27 10:13:39 -06:00
parent 6b6f5ff1f4
commit 208f37c230
3 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.idea/vcs.xml generated Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>

40
.idea/workspace.xml generated
View File

@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="601f9577-9354-4137-8c6e-f40020b4437a" name="Default" comment="" />
<list default="true" id="601f9577-9354-4137-8c6e-f40020b4437a" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/conversion/views.py" afterPath="$PROJECT_DIR$/conversion/views.py" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -15,7 +17,7 @@
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/main/templates/main/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
@@ -89,11 +91,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="views.py" pinned="false" current-in-tab="false">
<file leaf-file-name="views.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/conversion/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="22" column="31" lean-forward="false" selection-start-line="22" selection-start-column="27" selection-end-line="22" selection-end-column="31" />
<state relative-caret-position="130">
<caret line="14" column="4" lean-forward="false" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
<folding>
<element signature="e#0#35#0" expanded="true" />
</folding>
@@ -131,6 +133,9 @@
</list>
</option>
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
@@ -145,8 +150,8 @@
<option value="$PROJECT_DIR$/main/views.py" />
<option value="$PROJECT_DIR$/cs2610hw7/urls.py" />
<option value="$PROJECT_DIR$/conversion/urls.py" />
<option value="$PROJECT_DIR$/conversion/views.py" />
<option value="$PROJECT_DIR$/main/templates/main/index.html" />
<option value="$PROJECT_DIR$/conversion/views.py" />
</list>
</option>
</component>
@@ -160,6 +165,7 @@
<option name="width" value="1280" />
<option name="height" value="800" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
<flattenPackages />
@@ -512,7 +518,7 @@
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.503231" order="-1" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32954547" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32954547" sideWeight="0.49676898" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24959612" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
@@ -704,16 +710,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conversion/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="22" column="31" lean-forward="false" selection-start-line="22" selection-start-column="27" selection-end-line="22" selection-end-column="31" />
<folding>
<element signature="e#0#35#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cs2610hw7/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="318">
@@ -740,5 +736,15 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/conversion/views.py">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="130">
<caret line="14" column="4" lean-forward="false" selection-start-line="14" selection-start-column="4" selection-end-line="14" selection-end-column="4" />
<folding>
<element signature="e#0#35#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>

6
conversion/views.py
View File

@@ -7,21 +7,17 @@ import json
# Create your views here.
def get(request):
print(request)
value = request.GET.get('value')
frm = request.GET['from']
to = request.GET['to']
print(value, " ", to, " ", frm)
tmp = Converter.objects.get(units=frm)
print(tmp)
total = tmp.value * float(value)
print(str(total))
data = {}
data['units'] = to
data['value'] = total
json_data = json.dumps(data)
print(json_data)
return HttpResponse(json_data)
def init(request):