From 3510d088693babafa157fb9ae0164967a1e06ab9 Mon Sep 17 00:00:00 2001
From: zhang200554 <lihuan.zhang@student.unimelb.edu.au>
Date: Thu, 11 Oct 2018 14:57:28 +1100
Subject: [PATCH] test2
---
.idea/workspace.xml | 105 +++++++++++++++++++++-----------------------
cargo/views.py | 4 +-
2 files changed, 51 insertions(+), 58 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bfe55b2..d56b3c3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,11 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="8e0a1b72-f07e-4c5d-8e03-75ac89ac3031" name="Default Changelist" comment="">
- <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/vcs.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/../generate/.idea/vcs.xml" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/../generate/generate.py" afterDir="false" />
+ <change afterPath="$PROJECT_DIR$/../printing/.idea/vcs.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/PMPBackend/settings.py" beforeDir="false" afterPath="$PROJECT_DIR$/PMPBackend/settings.py" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/PMPBackend/urls.py" beforeDir="false" afterPath="$PROJECT_DIR$/PMPBackend/urls.py" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/cargo/views.py" beforeDir="false" afterPath="$PROJECT_DIR$/cargo/views.py" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -23,15 +24,15 @@
<entry key="project.closed" value="4" />
<entry key="project.open.time.1" value="1" />
<entry key="project.open.time.16" value="1" />
- <entry key="project.open.time.6" value="1" />
+ <entry key="project.open.time.6" value="2" />
<entry key="project.open.time.7" value="1" />
- <entry key="project.opened" value="4" />
+ <entry key="project.opened" value="5" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.edit">
<counts>
<entry key="html" value="181" />
- <entry key="py" value="6122" />
+ <entry key="py" value="6533" />
<entry key="txt" value="2" />
</counts>
</usages-collector>
@@ -39,7 +40,7 @@
<counts>
<entry key="HTML" value="181" />
<entry key="PLAIN_TEXT" value="2" />
- <entry key="Python" value="6122" />
+ <entry key="Python" value="6533" />
</counts>
</usages-collector>
<usages-collector id="statistics.file.extensions.open">
@@ -61,8 +62,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PMPBackend/settings.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-106">
- <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
+ <state relative-caret-position="828">
+ <caret line="134" column="36" lean-forward="true" selection-start-line="134" selection-start-column="36" selection-end-line="134" selection-end-column="36" />
</state>
</provider>
</entry>
@@ -82,8 +83,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cargo/models.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="6" column="26" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
+ <state relative-caret-position="255">
+ <caret line="17" column="29" lean-forward="true" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" />
</state>
</provider>
</entry>
@@ -91,13 +92,12 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/cargo/views.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="376">
- <caret line="77" column="32" lean-forward="true" selection-start-line="77" selection-start-column="32" selection-end-line="77" selection-end-column="32" />
+ <state relative-caret-position="300">
+ <caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
<folding>
- <element signature="e#0#45#0" expanded="true" />
- <marker date="1538741737406" expanded="true" signature="674:1340" ph="..." />
- <marker date="1538741737406" expanded="true" signature="3852:5054" ph="..." />
- <marker date="1538741737406" expanded="true" signature="5769:6475" ph="..." />
+ <element signature="e#2#47#0" expanded="true" />
+ <marker date="1539229978487" expanded="true" signature="749:1445" ph="..." />
+ <marker date="1539229978487" expanded="true" signature="3983:5185" ph="..." />
</folding>
</state>
</provider>
@@ -132,7 +132,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file:///usr/local/lib/python3.7/site-packages/django/db/backends/mysql/base.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-186">
+ <state relative-caret-position="75">
<caret line="5" selection-start-line="5" selection-end-line="5" />
<folding>
<element signature="e#104#113#0" expanded="true" />
@@ -144,7 +144,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file:///usr/local/lib/python3.7/site-packages/django/utils/autoreload.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
+ <state relative-caret-position="3195">
<caret line="224" selection-start-line="224" selection-end-line="224" />
</state>
</provider>
@@ -153,7 +153,7 @@
<file pinned="false" current-in-tab="false">
<entry file="file:///usr/local/lib/python3.7/site-packages/django/db/utils.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
+ <state relative-caret-position="2925">
<caret line="203" column="31" selection-start-line="203" selection-start-column="31" selection-end-line="203" selection-end-column="31" />
</state>
</provider>
@@ -189,9 +189,9 @@
<option value="$PROJECT_DIR$/PMPBackend/templates/lookUpBook.html" />
<option value="$PROJECT_DIR$/PMPBackend/views.py" />
<option value="$PROJECT_DIR$/PMPBackend/models.py" />
- <option value="$PROJECT_DIR$/PMPBackend/settings.py" />
<option value="$PROJECT_DIR$/cargo/models.py" />
<option value="$PROJECT_DIR$/PMPBackend/urls.py" />
+ <option value="$PROJECT_DIR$/PMPBackend/settings.py" />
<option value="$PROJECT_DIR$/cargo/views.py" />
</list>
</option>
@@ -317,7 +317,7 @@
<frame x="0" y="0" width="1680" height="1050" extended-state="0" />
<editor active="true" />
<layout>
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21611722" />
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.21855922" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Message" order="0" />
@@ -403,9 +403,17 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/PMPBackend/models.py" />
+ <entry file="file://$PROJECT_DIR$/manage.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="195">
+ <caret line="14" column="39" selection-start-line="14" selection-start-column="39" selection-end-line="14" selection-end-column="39" />
+ </state>
+ </provider>
+ </entry>
<entry file="file:///usr/local/lib/python3.7/site-packages/django/db/backends/mysql/base.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-186">
+ <state relative-caret-position="75">
<caret line="5" selection-start-line="5" selection-end-line="5" />
<folding>
<element signature="e#104#113#0" expanded="true" />
@@ -415,25 +423,18 @@
</entry>
<entry file="file:///usr/local/lib/python3.7/site-packages/django/utils/autoreload.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
+ <state relative-caret-position="3195">
<caret line="224" selection-start-line="224" selection-end-line="224" />
</state>
</provider>
</entry>
<entry file="file:///usr/local/lib/python3.7/site-packages/django/db/utils.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="240">
+ <state relative-caret-position="2925">
<caret line="203" column="31" selection-start-line="203" selection-start-column="31" selection-end-line="203" selection-end-column="31" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PMPBackend/models.py">
- <provider selected="true" editor-type-id="text-editor">
- <state>
- <caret selection-end-line="31" selection-end-column="47" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/PMPBackend/wsgi.py">
<provider selected="true" editor-type-id="text-editor" />
</entry>
@@ -447,46 +448,38 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/manage.py">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="195">
- <caret line="14" column="39" selection-start-line="14" selection-start-column="39" selection-end-line="14" selection-end-column="39" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/PMPBackend/settings.py">
+ <entry file="file://$PROJECT_DIR$/PMPBackend/urls.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-106">
- <caret line="42" lean-forward="true" selection-start-line="42" selection-end-line="42" />
+ <state relative-caret-position="375">
+ <caret line="25" column="54" selection-start-line="25" selection-start-column="54" selection-end-line="25" selection-end-column="54" />
+ <folding>
+ <element signature="e#635#667#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cargo/models.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="90">
- <caret line="6" column="26" selection-start-line="6" selection-start-column="26" selection-end-line="6" selection-end-column="26" />
+ <state relative-caret-position="255">
+ <caret line="17" column="29" lean-forward="true" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/PMPBackend/urls.py">
+ <entry file="file://$PROJECT_DIR$/PMPBackend/settings.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="375">
- <caret line="25" column="54" selection-start-line="25" selection-start-column="54" selection-end-line="25" selection-end-column="54" />
- <folding>
- <element signature="e#635#667#0" expanded="true" />
- </folding>
+ <state relative-caret-position="828">
+ <caret line="134" column="36" lean-forward="true" selection-start-line="134" selection-start-column="36" selection-end-line="134" selection-end-column="36" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/cargo/views.py">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="376">
- <caret line="77" column="32" lean-forward="true" selection-start-line="77" selection-start-column="32" selection-end-line="77" selection-end-column="32" />
+ <state relative-caret-position="300">
+ <caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
<folding>
- <element signature="e#0#45#0" expanded="true" />
- <marker date="1538741737406" expanded="true" signature="674:1340" ph="..." />
- <marker date="1538741737406" expanded="true" signature="3852:5054" ph="..." />
- <marker date="1538741737406" expanded="true" signature="5769:6475" ph="..." />
+ <element signature="e#2#47#0" expanded="true" />
+ <marker date="1539229978487" expanded="true" signature="749:1445" ph="..." />
+ <marker date="1539229978487" expanded="true" signature="3983:5185" ph="..." />
</folding>
</state>
</provider>
diff --git a/cargo/views.py b/cargo/views.py
index 65fbc45..ea5c3b7 100644
--- a/cargo/views.py
+++ b/cargo/views.py
@@ -31,7 +31,7 @@ def signIn(request):
#print(request.get_full_path(), file=sys.stderr)
passwordNow = request.GET['password']
- emailNow = request.GET['email'].__str__().replace('%40', '@')
+ emailNow = request.GET['email']
#print(passwordNow, file=sys.stderr)
#print(emailNow, file=sys.stderr)
@@ -56,7 +56,7 @@ def signUp(request):
req = json.loads(request.body.decode())
newUser = user()
- newUser.email = req.get('email').__str__()# + '@gmail.com'
+ newUser.email = req.get('email')
newUser.password = req.get('password')
newUser.userName = req.get('realname')
newUser.phoneNumber = req.get('phonenumber')
--
GitLab