Skip to content
Snippets Groups Projects
Commit a6bc7055 authored by Lihuan Zhang's avatar Lihuan Zhang
Browse files

test4

parent 7a536779
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
.idea/workspace.xml
+ 18
− 18
View file @ a6bc7055
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="8e0a1b72-f07e-4c5d-8e03-75ac89ac3031" name="Default Changelist" comment=""> <list default="true" id="8e0a1b72-f07e-4c5d-8e03-75ac89ac3031" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/../printing/.idea/vcs.xml" 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$/cargo/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/cargo/models.py" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
...@@ -56,11 +56,11 @@ ...@@ -56,11 +56,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/PMPBackend/settings.py"> <entry file="file://$PROJECT_DIR$/PMPBackend/settings.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405"> <state relative-caret-position="125">
<caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" /> <caret line="37" column="30" lean-forward="true" selection-start-line="37" selection-start-column="30" selection-end-line="37" selection-end-column="30" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -77,11 +77,11 @@ ...@@ -77,11 +77,11 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/cargo/models.py"> <entry file="file://$PROJECT_DIR$/cargo/models.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="465">
<caret line="17" column="29" lean-forward="true" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" /> <caret line="31" column="44" lean-forward="true" selection-start-line="31" selection-start-column="44" selection-end-line="31" selection-end-column="44" />
</state> </state>
</provider> </provider>
</entry> </entry>
...@@ -89,8 +89,8 @@ ...@@ -89,8 +89,8 @@
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/cargo/views.py"> <entry file="file://$PROJECT_DIR$/cargo/views.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="870"> <state relative-caret-position="-12">
<caret line="58" column="40" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" /> <caret line="164" column="9" lean-forward="true" selection-start-line="164" selection-start-column="9" selection-end-line="164" selection-end-column="9" />
<folding> <folding>
<element signature="e#2#47#0" expanded="true" /> <element signature="e#2#47#0" expanded="true" />
<marker date="1539230213513" expanded="true" signature="749:1415" ph="..." /> <marker date="1539230213513" expanded="true" signature="749:1415" ph="..." />
...@@ -186,10 +186,10 @@ ...@@ -186,10 +186,10 @@
<option value="$PROJECT_DIR$/PMPBackend/templates/lookUpBook.html" /> <option value="$PROJECT_DIR$/PMPBackend/templates/lookUpBook.html" />
<option value="$PROJECT_DIR$/PMPBackend/views.py" /> <option value="$PROJECT_DIR$/PMPBackend/views.py" />
<option value="$PROJECT_DIR$/PMPBackend/models.py" /> <option value="$PROJECT_DIR$/PMPBackend/models.py" />
<option value="$PROJECT_DIR$/cargo/models.py" />
<option value="$PROJECT_DIR$/PMPBackend/urls.py" /> <option value="$PROJECT_DIR$/PMPBackend/urls.py" />
<option value="$PROJECT_DIR$/cargo/views.py" /> <option value="$PROJECT_DIR$/cargo/views.py" />
<option value="$PROJECT_DIR$/PMPBackend/settings.py" /> <option value="$PROJECT_DIR$/PMPBackend/settings.py" />
<option value="$PROJECT_DIR$/cargo/models.py" />
</list> </list>
</option> </option>
</component> </component>
...@@ -467,17 +467,17 @@ ...@@ -467,17 +467,17 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/cargo/models.py"> <entry file="file://$PROJECT_DIR$/PMPBackend/settings.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="255"> <state relative-caret-position="125">
<caret line="17" column="29" lean-forward="true" selection-start-line="17" selection-start-column="29" selection-end-line="17" selection-end-column="29" /> <caret line="37" column="30" lean-forward="true" selection-start-line="37" selection-start-column="30" selection-end-line="37" selection-end-column="30" />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/cargo/views.py"> <entry file="file://$PROJECT_DIR$/cargo/views.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="870"> <state relative-caret-position="-12">
<caret line="58" column="40" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" /> <caret line="164" column="9" lean-forward="true" selection-start-line="164" selection-start-column="9" selection-end-line="164" selection-end-column="9" />
<folding> <folding>
<element signature="e#2#47#0" expanded="true" /> <element signature="e#2#47#0" expanded="true" />
<marker date="1539230213513" expanded="true" signature="749:1415" ph="..." /> <marker date="1539230213513" expanded="true" signature="749:1415" ph="..." />
...@@ -486,10 +486,10 @@ ...@@ -486,10 +486,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/PMPBackend/settings.py"> <entry file="file://$PROJECT_DIR$/cargo/models.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="405"> <state relative-caret-position="465">
<caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" /> <caret line="31" column="44" lean-forward="true" selection-start-line="31" selection-start-column="44" selection-end-line="31" selection-end-column="44" />
</state> </state>
</provider> </provider>
</entry> </entry>
......
cargo/models.py
+ 1
− 1
View file @ a6bc7055
...@@ -29,6 +29,6 @@ class requestbook(models.Model): ...@@ -29,6 +29,6 @@ class requestbook(models.Model):
customerMessage = models.TextField(null=True) customerMessage = models.TextField(null=True)
status = models.IntegerField(default=0) status = models.IntegerField(default=0)
cost = models.IntegerField(null=True) cost = models.IntegerField(null=True)
pickupDate = models.DateTimeField(null=True) pickupDate = models.DateField(null=True)
HBL = models.CharField(max_length=30, null=True) HBL = models.CharField(max_length=30, null=True)
shiperMessage = models.TextField(null=True) shiperMessage = models.TextField(null=True)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment