diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 70df3b8110af5e54600f8919738bb9bd7975ed29..66218999dd53ef7f4e71a7c85b9dda868e13d886 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,7 +3,7 @@ <component name="ChangeListManager"> <list default="true" id="8e0a1b72-f07e-4c5d-8e03-75ac89ac3031" name="Default Changelist" comment=""> <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> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="SHOW_DIALOG" value="false" /> @@ -56,11 +56,11 @@ </component> <component name="FileEditorManager"> <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"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="405"> - <caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" /> + <state relative-caret-position="125"> + <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> </provider> </entry> @@ -77,11 +77,11 @@ </provider> </entry> </file> - <file pinned="false" current-in-tab="false"> + <file pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/cargo/models.py"> <provider selected="true" editor-type-id="text-editor"> - <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 relative-caret-position="465"> + <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> </provider> </entry> @@ -89,8 +89,8 @@ <file pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/cargo/views.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="870"> - <caret line="58" column="40" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" /> + <state relative-caret-position="-12"> + <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> <element signature="e#2#47#0" expanded="true" /> <marker date="1539230213513" expanded="true" signature="749:1415" ph="..." /> @@ -186,10 +186,10 @@ <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$/cargo/models.py" /> <option value="$PROJECT_DIR$/PMPBackend/urls.py" /> <option value="$PROJECT_DIR$/cargo/views.py" /> <option value="$PROJECT_DIR$/PMPBackend/settings.py" /> + <option value="$PROJECT_DIR$/cargo/models.py" /> </list> </option> </component> @@ -467,17 +467,17 @@ </state> </provider> </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"> - <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 relative-caret-position="125"> + <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> </provider> </entry> <entry file="file://$PROJECT_DIR$/cargo/views.py"> <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="870"> - <caret line="58" column="40" selection-start-line="58" selection-start-column="40" selection-end-line="58" selection-end-column="40" /> + <state relative-caret-position="-12"> + <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> <element signature="e#2#47#0" expanded="true" /> <marker date="1539230213513" expanded="true" signature="749:1415" ph="..." /> @@ -486,10 +486,10 @@ </state> </provider> </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"> - <state relative-caret-position="405"> - <caret line="27" column="32" selection-start-line="27" selection-start-column="32" selection-end-line="27" selection-end-column="32" /> + <state relative-caret-position="465"> + <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> </provider> </entry> diff --git a/cargo/models.py b/cargo/models.py index d2150d1830117c88f5a63200f635a16d3a542eb0..caabf1e9abd3b1cfc3c6b96a60ee8c74b4622d05 100644 --- a/cargo/models.py +++ b/cargo/models.py @@ -29,6 +29,6 @@ class requestbook(models.Model): customerMessage = models.TextField(null=True) status = models.IntegerField(default=0) cost = models.IntegerField(null=True) - pickupDate = models.DateTimeField(null=True) + pickupDate = models.DateField(null=True) HBL = models.CharField(max_length=30, null=True) shiperMessage = models.TextField(null=True)