diff --git a/web/.idea/deployment.xml b/web/.idea/deployment.xml
index b3bc7c050cc93bc4f117b86780b050f730c31a3a..ca075cc9b31a03e9c23048cd86637c4d567663b5 100644
--- a/web/.idea/deployment.xml
+++ b/web/.idea/deployment.xml
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="PublishConfigData" autoUpload="Always" serverName="warpauth">
+ <component name="PublishConfigData" autoUpload="Always" serverName="s1WARP">
<serverData>
- <paths name="warpauth">
+ <paths name="s1WARP">
<serverdata>
<mappings>
- <mapping deploy="warpauth" local="$PROJECT_DIR$" web="/" />
+ <mapping deploy="/warpauth" local="$PROJECT_DIR$" web="/" />
</mappings>
</serverdata>
</paths>
diff --git a/web/.idea/inspectionProfiles/Project_Default.xml b/web/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ac21435ff56574cdca5c5840825818701d9c6248
--- /dev/null
+++ b/web/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+ <profile version="1.0">
+ <option name="myName" value="Project Default" />
+ <inspection_tool class="PyInterpreterInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+ </profile>
+</component>
\ No newline at end of file
diff --git a/web/.idea/inspectionProfiles/profiles_settings.xml b/web/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000000000000000000000000000000000000..3b312839bf2e939fea3ebdef15630a4b33e57caf
--- /dev/null
+++ b/web/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+ <settings>
+ <option name="PROJECT_PROFILE" value="Project Default" />
+ <option name="USE_PROJECT_PROFILE" value="true" />
+ <version value="1.0" />
+ </settings>
+</component>
\ No newline at end of file
diff --git a/web/.idea/workspace.xml b/web/.idea/workspace.xml
index 44a51c9bb850b61be6432f7b86dd3cda9b5c1828..2d8bfbac9904c5586ebe1de1863cbdcd78ba8551 100644
--- a/web/.idea/workspace.xml
+++ b/web/.idea/workspace.xml
@@ -25,105 +25,23 @@
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="main.py" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/warpauthWeb/views/main.py">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="8" column="44" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="44" />
- <folding>
- <element signature="e#0#35#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="login.py" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/warpauthWeb/views/login.py">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="33" column="0" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
- <folding>
- <element signature="e#0#35#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="about.html" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/about.html">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.65384614">
- <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="change_password.html" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/reset_password/change_password.html">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-7.1923075">
- <caret line="11" column="54" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="54" />
- <folding>
- <element signature="e#748#773#0#HTML" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="token_gen.html" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/reset_password/token_gen.html">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.65384614">
- <caret line="1" column="12" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="12" />
- <folding>
- <element signature="e#674#699#0#HTML" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="login.html" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/login.html">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-3.9230769">
- <caret line="6" column="73" selection-start-line="1" selection-start-column="0" selection-end-line="6" selection-end-column="73" />
- <folding>
- <element signature="n#style#0;n#label#1;n#form#0;n#!!top" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="base.html" pinned="false" current-in-tab="false">
+ <file leaf-file-name="base.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/warpauthWeb/templates/base.html">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-32.692307">
- <caret line="53" column="88" selection-start-line="53" selection-start-column="88" selection-end-line="53" selection-end-column="88" />
+ <state vertical-scroll-proportion="0.75622773">
+ <caret line="73" column="5" selection-start-line="73" selection-start-column="5" selection-end-line="73" selection-end-column="5" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="reset_password.py" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/warpauthWeb/views/reset_password.py">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.4832776">
- <caret line="17" column="20" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
- <folding>
- <element signature="e#0#35#0" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
<option name="RECENT_TEMPLATES">
<list>
- <option value="Html5" />
<option value="Python Script" />
+ <option value="Html5" />
</list>
</option>
</component>
@@ -134,20 +52,26 @@
<option value="$PROJECT_DIR$/warpauthWeb/templates/main.html" />
<option value="$PROJECT_DIR$/warpauthWeb/templates/reset_password.html" />
<option value="$PROJECT_DIR$/warpauth/settings.py" />
- <option value="$PROJECT_DIR$/warpauthWeb/models.py" />
<option value="$PROJECT_DIR$/warpauthWeb/views.py" />
<option value="$PROJECT_DIR$/warpauthWeb/views/views.py" />
- <option value="$PROJECT_DIR$/warpauthWeb/urls.py" />
- <option value="$PROJECT_DIR$/warpauthWeb/util.py" />
<option value="$PROJECT_DIR$/warpauth/urls.py" />
- <option value="$PROJECT_DIR$/warpauthWeb/templates/base.html" />
<option value="$PROJECT_DIR$/warpauthWeb/views/login.py" />
- <option value="$PROJECT_DIR$/warpauthWeb/templates/login.html" />
<option value="$PROJECT_DIR$/warpauthWeb/templates/reset_password/change_password.html" />
<option value="$PROJECT_DIR$/warpauthWeb/templates/reset_password/token_gen.html" />
- <option value="$PROJECT_DIR$/warpauthWeb/templates/about.html" />
- <option value="$PROJECT_DIR$/warpauthWeb/views/main.py" />
<option value="$PROJECT_DIR$/warpauthWeb/views/reset_password.py" />
+ <option value="$PROJECT_DIR$/warpauthWeb/templates/login.html" />
+ <option value="$PROJECT_DIR$/warpauthWeb/views/main.py" />
+ <option value="$PROJECT_DIR$/warpauthWeb/templates/about.html" />
+ <option value="$PROJECT_DIR$/warpauthWeb/admin.py" />
+ <option value="$PROJECT_DIR$/warpauthWeb/util.py" />
+ <option value="$PROJECT_DIR$/warpauthWeb/views/pizza_sheet.py" />
+ <option value="$PROJECT_DIR$/warpauthWeb/templates/warp_food.html" />
+ <option value="$PROJECT_DIR$/warpauthWeb/models.py" />
+ <option value="$PROJECT_DIR$/warpauthWeb/urls.py" />
+ <option value="$PROJECT_DIR$/warpauthWeb/views/warp_food.py" />
+ <option value="$PROJECT_DIR$/warpauthWeb/templates/warp_food/main.html" />
+ <option value="$PROJECT_DIR$/warpauthWeb/templates/warp_food/view.html" />
+ <option value="$PROJECT_DIR$/warpauthWeb/templates/base.html" />
</list>
</option>
</component>
@@ -159,10 +83,10 @@
<order />
</component>
<component name="ProjectFrameBounds">
- <option name="x" value="-8" />
- <option name="y" value="-8" />
- <option name="width" value="1936" />
- <option name="height" value="1066" />
+ <option name="x" value="-9" />
+ <option name="y" value="-9" />
+ <option name="width" value="1938" />
+ <option name="height" value="1064" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
@@ -187,6 +111,8 @@
<sortByType />
</navigator>
<panes>
+ <pane id="Scope" />
+ <pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -273,25 +199,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="reset_password" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="web" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="web" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="warpauthWeb" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="migrations" />
+ <option name="myItemId" value="warp_food" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -309,24 +217,8 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="web" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="web" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="media" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</pane>
- <pane id="Scratches" />
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -339,9 +231,12 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
+ <recent name="C:\Users\Chris\Documents\git\warpzone\warpauth\web\warpauthWeb\templates" />
+ <recent name="C:\Users\Chris\Documents\git\warpzone\warpauth\web\warpauthWeb" />
<recent name="C:\Users\Chris\Documents\git\warpzone\warpauth\web\media" />
</key>
<key name="MoveFile.RECENT_KEYS">
+ <recent name="C:\Users\Chris\Documents\git\warpzone\warpauth\web\warpauthWeb\templates\warp_food" />
<recent name="C:\Users\Chris\Documents\git\warpzone\warpauth\web\media" />
<recent name="C:\Users\Chris\Documents\git\warpzone\warpauth\web\warpauthWeb\views" />
<recent name="C:\Users\Chris\Documents\git\warpzone\warpauth\web\warpauthWeb\templates\reset_password" />
@@ -600,19 +495,20 @@
<servers />
</component>
<component name="ToolWindowManager">
- <frame x="-8" y="-8" width="1936" height="1066" extended-state="6" />
+ <frame x="-9" y="-9" width="1938" height="1064" extended-state="6" />
<editor active="true" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" 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="true" weight="0.32976446" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
+ <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32056892" sideWeight="0.50213903" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
- <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32869378" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
+ <window_info id="GitLabIntegration" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
+ <window_info id="File Transfer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32056892" sideWeight="0.49786097" order="7" 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" weight="0.33" sideWeight="0.5" order="7" 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" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Remote Host" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25266525" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2529412" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32869378" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -634,71 +530,81 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/warpauth/settings.py">
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/views/main.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
+ <caret line="8" column="44" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="44" />
+ <folding>
+ <element signature="e#0#35#0" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauth/urls.py">
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/views/login.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="13" column="68" selection-start-line="13" selection-start-column="68" selection-end-line="13" selection-end-column="68" />
- <folding />
+ <caret line="33" column="0" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
+ <folding>
+ <element signature="e#0#35#0" expanded="false" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="jar://$APPLICATION_HOME_DIR$/lib/pycharm.jar!/resources/html5-schema/html5/web-forms2.rnc">
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/about.html">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.33333334">
- <caret line="568" column="22" selection-start-line="568" selection-start-column="22" selection-end-line="568" selection-end-column="22" />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauth/__init__.py">
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/reset_password/change_password.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
+ <caret line="11" column="54" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="54" />
+ <folding>
+ <element signature="e#748#773#0#HTML" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauth/settings.py">
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/reset_password/token_gen.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="53" column="62" selection-start-line="53" selection-start-column="62" selection-end-line="53" selection-end-column="62" />
- <folding />
+ <caret line="1" column="12" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="12" />
+ <folding>
+ <element signature="e#674#699#0#HTML" expanded="true" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauth/urls.py">
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/login.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <caret line="6" column="73" selection-start-line="1" selection-start-column="0" selection-end-line="6" selection-end-column="73" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauth/wsgi.py">
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/base.html">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="13" column="57" selection-start-line="13" selection-start-column="57" selection-end-line="13" selection-end-column="57" />
+ <caret line="53" column="88" selection-start-line="53" selection-start-column="88" selection-end-line="53" selection-end-column="88" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauthWeb/templatetags/__init__.py">
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/views/reset_password.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
+ <folding>
+ <element signature="e#0#35#0" expanded="false" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauthWeb/__init__.py">
+ <entry file="file://$PROJECT_DIR$/warpauth/settings.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
@@ -706,61 +612,60 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauthWeb/admin.py">
+ <entry file="file://$PROJECT_DIR$/warpauth/urls.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <caret line="13" column="68" selection-start-line="13" selection-start-column="68" selection-end-line="13" selection-end-column="68" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauthWeb/tests.py">
+ <entry file="jar://$APPLICATION_HOME_DIR$/lib/pycharm.jar!/resources/html5-schema/html5/web-forms2.rnc">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.33333334">
+ <caret line="568" column="22" selection-start-line="568" selection-start-column="22" selection-end-line="568" selection-end-column="22" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/warpauth/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauthWeb/models.py">
+ <entry file="file://$PROJECT_DIR$/warpauth/wsgi.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="4" column="39" selection-start-line="4" selection-start-column="39" selection-end-line="4" selection-end-column="39" />
- <folding>
- <element signature="e#0#28#0" expanded="true" />
- </folding>
+ <caret line="13" column="57" selection-start-line="13" selection-start-column="57" selection-end-line="13" selection-end-column="57" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauthWeb/util.py">
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/templatetags/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/manage.py">
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/__init__.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
- <folding />
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauthWeb/urls.py">
+ <entry file="file://$PROJECT_DIR$/manage.py">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.07505519">
- <caret line="4" column="26" selection-start-line="4" selection-start-column="26" selection-end-line="4" selection-end-column="26" />
- <folding>
- <element signature="e#0#32#0" expanded="true" />
- </folding>
+ <state vertical-scroll-proportion="0.0">
+ <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/warpauthWeb/templates/reset_password/change_password.html">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-7.1923075">
+ <state vertical-scroll-proportion="0.0">
<caret line="11" column="54" selection-start-line="11" selection-start-column="44" selection-end-line="11" selection-end-column="54" />
<folding>
<element signature="e#748#773#0#HTML" expanded="true" />
@@ -770,7 +675,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/warpauthWeb/templates/reset_password/token_gen.html">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.65384614">
+ <state vertical-scroll-proportion="0.0">
<caret line="1" column="12" selection-start-line="1" selection-start-column="8" selection-end-line="1" selection-end-column="12" />
<folding>
<element signature="e#674#699#0#HTML" expanded="true" />
@@ -778,61 +683,149 @@
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/views/reset_password.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-0.03125">
+ <caret line="17" column="20" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
+ <folding>
+ <element signature="e#0#35#0" expanded="false" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/login.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-5.8846154">
+ <caret line="9" column="13" selection-start-line="9" selection-start-column="13" selection-end-line="9" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/warpauth/urls.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-1.59375">
+ <caret line="5" column="46" selection-start-line="5" selection-start-column="46" selection-end-line="5" selection-end-column="46" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
<entry file="file://$PROJECT_DIR$/warpauthWeb/views/login.py">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <state vertical-scroll-proportion="-14.5625">
<caret line="33" column="0" selection-start-line="33" selection-start-column="0" selection-end-line="33" selection-end-column="0" />
<folding>
- <element signature="e#0#35#0" expanded="true" />
+ <element signature="e#0#35#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/warpauthWeb/templates/about.html">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.65384614">
- <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
+ <state vertical-scroll-proportion="-3.2692308">
+ <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/login.html">
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/util.py">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-3.9230769">
- <caret line="6" column="73" selection-start-line="1" selection-start-column="0" selection-end-line="6" selection-end-column="73" />
- <folding>
- <element signature="n#style#0;n#label#1;n#form#0;n#!!top" expanded="true" />
- </folding>
+ <state vertical-scroll-proportion="0.029929578">
+ <caret line="1" column="40" selection-start-line="1" selection-start-column="40" selection-end-line="1" selection-end-column="40" />
+ <folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/warpauthWeb/views/main.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="8" column="44" selection-start-line="8" selection-start-column="10" selection-end-line="8" selection-end-column="44" />
+ <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
<folding>
<element signature="e#0#35#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/base.html">
+ <entry file="file://$PROJECT_DIR$/warpauth/settings.py">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-32.692307">
- <caret line="53" column="88" selection-start-line="53" selection-start-column="88" selection-end-line="53" selection-end-column="88" />
+ <state vertical-scroll-proportion="0.50880283">
+ <caret line="45" column="20" selection-start-line="45" selection-start-column="20" selection-end-line="45" selection-end-column="20" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/warpauthWeb/views/reset_password.py">
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/admin.py">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.4832776">
- <caret line="17" column="20" selection-start-line="17" selection-start-column="20" selection-end-line="17" selection-end-column="20" />
+ <state vertical-scroll-proportion="0.23943663">
+ <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+ <folding>
+ <element signature="e#0#32#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/tests.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/urls.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="15" column="73" selection-start-line="15" selection-start-column="73" selection-end-line="15" selection-end-column="73" />
+ <folding>
+ <element signature="e#0#32#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/models.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="25" column="10" selection-start-line="25" selection-start-column="4" selection-end-line="25" selection-end-column="10" />
+ <folding>
+ <element signature="e#0#28#0" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/warp_food/main.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.6672598">
+ <caret line="25" column="38" selection-start-line="25" selection-start-column="38" selection-end-line="25" selection-end-column="38" />
+ <folding>
+ <element signature="e#435#454#0#HTML" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/warp_food/view.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.21174377">
+ <caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/views/warp_food.py">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.15646258">
+ <caret line="19" column="6" selection-start-line="19" selection-start-column="6" selection-end-line="19" selection-end-column="6" />
<folding>
<element signature="e#0#35#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/warpauthWeb/templates/base.html">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.75622773">
+ <caret line="73" column="5" selection-start-line="73" selection-start-column="5" selection-end-line="73" selection-end-column="5" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/web/warpauthWeb/admin.py b/web/warpauthWeb/admin.py
index 8c38f3f3dad51e4585f3984282c2a4bec5349c1e..9b159d4381415f959aa86c39932cc21212b55c2d 100644
--- a/web/warpauthWeb/admin.py
+++ b/web/warpauthWeb/admin.py
@@ -1,3 +1,8 @@
from django.contrib import admin
-
+from warpauthWeb.models import PizzaService
# Register your models here.
+
+
+@admin.register(PizzaService)
+class PizzaService_admin(admin.ModelAdmin):
+ pass
diff --git a/web/warpauthWeb/models.py b/web/warpauthWeb/models.py
index 4be68cf4e66085dbadadf608d84115c73353b58f..1cf42dbaeefa837ca85b6b3fef02688bcd930e45 100644
--- a/web/warpauthWeb/models.py
+++ b/web/warpauthWeb/models.py
@@ -1,6 +1,9 @@
from django.db import models
from ldapdb.models.fields import CharField, IntegerField, ListField
import ldapdb.models
+from django.forms import ModelForm, HiddenInput
+from django import forms
+from django.utils import timezone
class PasswordResetToken(models.Model):
user = models.CharField(max_length=100)
@@ -8,6 +11,54 @@ class PasswordResetToken(models.Model):
hash = models.CharField(max_length=100)
created = models.DateTimeField(auto_now_add=True)
+
+class PizzaService(models.Model):
+ name = models.CharField(max_length=250)
+ phone = models.CharField(max_length=250)
+
+ def __str__(self):
+ return self.name
+
+class FoodSheet(models.Model):
+ date = models.DateTimeField(default=timezone.now)
+ pizza_service = models.ForeignKey(PizzaService, on_delete=models.CASCADE)
+ estimated_order_time = models.DateTimeField()
+ closed = models.BooleanField(default=False)
+ order_user = models.CharField(max_length=100, null=True)
+ order_time = models.DateTimeField(null=True)
+
+
+class FoodOrder(models.Model):
+ sheet = models.ForeignKey(FoodSheet, on_delete=models.CASCADE)
+ user = models.CharField(max_length=100,null=True)
+ article = models.CharField(max_length=100, null=True)
+ size = models.CharField(max_length=100, null=True)
+ comment = models.CharField(max_length=100, null=True)
+ price = models.FloatField()
+ paid = models.BooleanField()
+
+
+class FoodSheetForm(ModelForm):
+ class Meta:
+ model = FoodSheet
+ fields = ['pizza_service', 'estimated_order_time']
+
+
+class FoodOrderForm(ModelForm):
+ comment = forms.CharField(required=False)
+ paid = forms.CharField(required=False)
+
+ class Meta:
+ model = FoodOrder
+ fields = ['sheet', 'user', 'article', 'size', 'comment', 'price', 'paid']
+ widgets = {'sheet': HiddenInput(), 'user': HiddenInput()}
+
+class PizzaServiceForm(ModelForm):
+ class Meta:
+ model = PizzaService
+ fields = ['name', 'phone']
+
+
# LDAP
@@ -37,4 +88,6 @@ class LdapGroup(ldapdb.models.Model):
return self.name
def __unicode__(self):
- return self.name
\ No newline at end of file
+ return self.name
+
+
diff --git a/web/warpauthWeb/templates/about.html b/web/warpauthWeb/templates/about.html
index bc06034be96bb5b673008b6bb3dbe3709bcab555..18b058400e9faf43c28d455a0d665ddf18620fa5 100644
--- a/web/warpauthWeb/templates/about.html
+++ b/web/warpauthWeb/templates/about.html
@@ -3,4 +3,5 @@
{% load i18n %}
{% block content %}
+
{% endblock %}
\ No newline at end of file
diff --git a/web/warpauthWeb/templates/base.html b/web/warpauthWeb/templates/base.html
index 037cbf450de2c2761792cf1d97fa8ba4f8c7fcbe..1de9eacab2b0f0d440586232d6094edcb7c4de4d 100644
--- a/web/warpauthWeb/templates/base.html
+++ b/web/warpauthWeb/templates/base.html
@@ -1,86 +1,88 @@
-<link rel="stylesheet" href="{{ MEDIA_URL }}/media/css/bootstrap.min.css" />
-<script type="text/javascript" src="{{ MEDIA_URL }}/media/js/jquery.js" />
-<script src="/media/js/bootstrap.js" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
+<html>
+ <head>
+ <link rel="stylesheet" href="{{ MEDIA_URL }}/media/css/bootstrap.min.css" />
+ <script type="text/javascript" src="{{ MEDIA_URL }}/media/js/jquery.js" ></script>
+ <script src="/media/js/bootstrap.js"></script>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
-<style>
- .table-scrollable{
- overflow: auto;
- }
-</style>
+ <style>
+ .table-scrollable{
+ overflow: auto;
+ }
+ </style>
-<script>jQuery(function($) {
- $("tr[data-link]").click(function() {
- window.location = this.dataset.link
- });
- })
-</script>
-
-{% if body == "login" %}
-<div class="wrap" style="background-color: #eee; height: 100%">
-{% endif %}
-<header>
- <nav class="navbar navbar-inverse img-rounded">
- <div class="container">
- <div class="navbar-header">
- <a class="navbar-brand" href="/">
- <img style="display: inline; text-align:left" height="25" width="25" src='/media/warpzone_logo.png'/> WarpAuth
- </a>
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- </div>
- <div class="collapse navbar-collapse" id="myNavbar">
- {% if request.user.is_authenticated %}
- <ul class="nav navbar-nav">
+ <script>jQuery(function($) {
+ $("tr[data-link]").click(function() {
+ window.location = this.dataset.link
+ });
+ })
+ </script>
+ </head>
+ <body>
+ {% if body == "login" %}
+ <div class="wrap" style="background-color: #eee; height: 100%">
+ {% endif %}
+ <header>
+ <nav class="navbar navbar-inverse img-rounded">
+ <div class="container">
+ <div class="navbar-header">
+ <a class="navbar-brand" href="/">
+ <img style="display: inline; text-align:left" height="25" width="25" src='/media/warpzone_logo.png'/> WarpAuth
+ </a>
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ </div>
+ <div class="collapse navbar-collapse" id="myNavbar">
+ {% if request.user.is_authenticated %}
+ <ul class="nav navbar-nav">
+ {% for page in pages %}
+ {% if page.name != "Logout" and page.name != "Admin" and page.name != "Configuration" %}
+ <li><a href="/{{ page.link }}">{{ page.name}}</a></li>
+ {% endif %}
+ {% endfor %}
+ </ul>
{% for page in pages %}
- {% if page.name != "Logout" and page.name != "Admin" and page.name != "Configuration" %}
- <li><a href="/{{ page.link }}">{{ page.name}}</a></li>
- {% endif %}
- {% endfor %}
- </ul>
- {% for page in pages %}
- {% if page.name == "Logout" %}
- <ul class="nav navbar-nav navbar-right"><li><a href="/{{ page.link }}">{{ page.name}}</a></li></ul>
- {% elif page.name == "Admin" and user.is_superuser %}
- <ul class="nav navbar-nav navbar-right">
- <li>
- <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ page.name}}<span class="caret"></span></a>
- <ul class="dropdown-menu">
- <li><a href="/{{ page.link }}_daemon/">Daemon</a></li>
- <li><a href="/{{ page.link }}_services/">Services</a></li>
- <li><a href="/{{ page.link }}_regex/">Regex</a></li>
+ {% if page.name == "Logout" %}
+ <ul class="nav navbar-nav navbar-right"><li><a href="/{{ page.link }}">{{ page.name}}</a></li></ul>
+ {% elif page.name == "Admin" and user.is_superuser %}
+ <ul class="nav navbar-nav navbar-right">
+ <li>
+ <a class="dropdown-toggle" data-toggle="dropdown" href="#">{{ page.name}}<span class="caret"></span></a>
+ <ul class="dropdown-menu">
+ <li><a href="/{{ page.link }}_daemon/">Daemon</a></li>
+ <li><a href="/{{ page.link }}_services/">Services</a></li>
+ <li><a href="/{{ page.link }}_regex/">Regex</a></li>
+ </ul>
+ </li>
</ul>
- </li>
- </ul>
- {% endif %}
- {% endfor %}
- {% endif %}
+ {% endif %}
+ {% endfor %}
+ {% endif %}
+ </div>
</div>
- </div>
- </nav>
-</header>
-{% if body != "login" %}
-<div class="container">
-{% endif %}
+ </nav>
+ </header>
+
+ <div class="container">
{% block content %}
{% endblock %}
-
-
- <br><br>
-</div>
-<footer>
-<div class="footer navbar-fixed-bottom img-rounded" style="background-color: #f5f5f5; border-top: solid; border-width: thin; border-color: grey">
- <div class="container">
- <div class="container">
- <div class="navbar-header">
- <p class="text-muted"><small>Warpzone</small></p>
+ <br><br>
+ </div>
+ <footer>
+ <div class="footer navbar-fixed-bottom img-rounded" style="background-color: #f5f5f5; border-top: solid; border-width: thin; border-color: grey">
+ <div class="container">
+ <div class="container">
+ <div class="navbar-header">
+ <p class="text-muted"><small>Warpzone</small></p>
+ </div>
+ </div>
</div>
</div>
- </div>
-</div>
-</footer>
+ </footer>
+</body>
+</html>
diff --git a/web/warpauthWeb/templates/login.html b/web/warpauthWeb/templates/login.html
index 2c0fc07e2d6922bc5bc50d09a37eaab3b3fc3926..4bed3ccf348b4e36b93ef42bfa301b908eb9e425 100644
--- a/web/warpauthWeb/templates/login.html
+++ b/web/warpauthWeb/templates/login.html
@@ -7,7 +7,7 @@
<h2 class="form-signin-heading">{% trans "Please sign in" %}</h2>
<label for="inputUser">{% trans "Username" %}</label>
<input name="username" type="user" id="inputUser" class="form-control" placeholder="{% trans "Username" %}" required autofocus>
-
+ Hallo
<label for="inputPassword" style="padding-top:10px;">{% trans "Password" %}</label>
<input name="password" type="password" id="inputPassword" class="form-control" placeholder="{% trans "Password" %}" required>
{% if fail == True %}
diff --git a/web/warpauthWeb/templates/warp_food/main.html b/web/warpauthWeb/templates/warp_food/main.html
new file mode 100644
index 0000000000000000000000000000000000000000..2e1dabb08faa7db2ed71b787dfa7877cad50fa7b
--- /dev/null
+++ b/web/warpauthWeb/templates/warp_food/main.html
@@ -0,0 +1,31 @@
+{% extends "base.html" %}
+
+{% load i18n %}
+
+ {% load bootstrap %}
+
+{% block content %}
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <form class="form-horizontal" method="POST" role="form">
+ {{ create_food_sheet|bootstrap_horizontal }}
+ <div class="form-group">
+ <div class="col-sm-offset-2 col-sm-10">
+ {% csrf_token %}
+ <button style="float: left" type="submit" formmethod="post" class="btn btn-primary">{% trans "Create Food Sheet" %}</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr><th>{% trans "Estimated Order Time" %}</th><th>{% trans "Pizza Service" %}</th></tr>
+ </thead>
+ <tbody>
+ {% for sheet in food_sheets %}
+ <tr data-link="/pizza/view/{{ sheet.id }}/"><td>{{ sheet.estimated_order_time }}</td><td>{{ sheet.pizza_service }}</td></tr>
+ {% endfor %}
+ </tbody>
+ </table>
+{% endblock %}
\ No newline at end of file
diff --git a/web/warpauthWeb/templates/warp_food/view.html b/web/warpauthWeb/templates/warp_food/view.html
new file mode 100644
index 0000000000000000000000000000000000000000..db9ee6b8c64bed013435bace22cbff1ab2fc17cb
--- /dev/null
+++ b/web/warpauthWeb/templates/warp_food/view.html
@@ -0,0 +1,76 @@
+{% extends "base.html" %}
+
+{% load i18n %}
+
+ {% load bootstrap %}
+
+{% block content %}
+
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <div class="row">
+ <div class="col-md-8">
+ <h4>{{ sheet.pizza_service.name }}</h4>
+ <small>{{ sheet.pizza_service.phone }}</small><br/><br/>
+ <small>{{ sheet.estimated_order_time }}</small><br/><br/>
+ <a href="" class="btn btn-primary">Edit Sheet</a>
+ {% if not sheet.closed %}
+ <a href="/pizza/toggle_sheet/{{ sheet.id }}" class="btn btn-danger">Close Sheet</a>
+ {% else %}
+ <a href="/pizza/toggle_sheet/{{ sheet.id }}" class="btn btn-success">Open Sheet</a>
+ {% endif %}
+ {% if sheet.closed %}
+ <a href="" class="btn btn-info">Print order</a>
+ {% endif %}
+ </div>
+ <div class="col-md-4">
+ <h4>{% trans "Order Sum" %}: {{ order_sum }} €</h4>
+ </div>
+
+ </div>
+ </div>
+ </div>
+ {% if not sheet.closed %}
+ <div class="panel panel-default">
+ <div class="panel-body">
+ <form class="form-horizontal" method="POST" role="form">
+ {{ create_food_order|bootstrap_horizontal }}
+ <div class="form-group">
+ <div class="col-sm-offset-2 col-sm-10">
+ {% csrf_token %}
+ <button style="float: left" type="submit" formmethod="post" class="btn btn-primary">{% trans "Create Food Sheet" %}</button>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ {% endif %}
+ <table class="table table-striped table-hover">
+ <thead>
+ <tr>
+ <th>{% trans "User Name" %}</th>
+ <th>{% trans "Article" %}</th>
+ <th>{% trans "Size" %}</th>
+ <th>{% trans "Price" %}</th>
+ <th>{% trans "Comment" %}</th>
+ <th>{% trans "Paid" %}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for order in orders %}
+ <tr>
+ <td>{{ order.user_name }}</td>
+ <td>{{ order.article }}</td>
+ <td>{{ order.size }}</td>
+ <td>{{ order.price }} €</td>
+ <td>{{ order.comment }}</td>
+ <td>
+ {% if order.paid %}
+ <a class="btn btn-xs btn-success" href="/pizza/toggle_paid/{{ order.id }}">{{ order.paid }}</a></td></tr>
+ {% else %}
+ <a class="btn btn-xs btn-danger" href="/pizza/toggle_paid/{{ order.id }}">{{ order.paid }}</a></td></tr>
+ {% endif %}
+ {% endfor %}
+ </tbody>
+ </table>
+{% endblock %}
diff --git a/web/warpauthWeb/urls.py b/web/warpauthWeb/urls.py
index 18b22f7d2782df00be1dd8a60bd99cf061def64c..a2c1d928c790fd4883e2199bf525458b3b33d32d 100644
--- a/web/warpauthWeb/urls.py
+++ b/web/warpauthWeb/urls.py
@@ -1,13 +1,21 @@
from django.conf.urls import url
-from warpauthWeb.views import main,login,reset_password
+from warpauthWeb.views import main,login,reset_password, warp_food
urlpatterns = [
# Authentication Pages
url(r'^login/$', login.login_view, name='index'),
url(r'^logout/$', login.logout_view, name='index'),
url(r'^reset_password/$', reset_password.gen_token, name='index'),
+
url(r'^reset_password/(?P<reset_hash>\w+)/$', reset_password.change_password, name='index'),
# Main Page
+
+ url(r'^pizza/$', warp_food.index, name='warp_foot'),
+ url(r'^pizza/view/(?P<sheet_id>\w+)/$', warp_food.view, name='warp_foot_view'),
+ url(r'^pizza/toggle_sheet/(?P<sheet_id>\w+)/$', warp_food.toggle_closed, name='warp_foot_toggle_closed'),
+ url(r'^pizza/toggle_paid/(?P<order_id>\w+)/$', warp_food.toggle_paid, name='warp_foot_toggle_paid'),
+
+
url(r'^$', main.index, name='index'),
diff --git a/web/warpauthWeb/util.py b/web/warpauthWeb/util.py
index e5f8b18581316e38078ac2c99612753b472050f0..e2e0407399e53c6f9dcf51085f5ebed0a0032324 100644
--- a/web/warpauthWeb/util.py
+++ b/web/warpauthWeb/util.py
@@ -1,4 +1,5 @@
pages = {'pages': [
+ {"link":"pizza", "name": "PizzaSheet"},
{"link":"about", "name": "About"},
{"link":"logout", "name": "Logout"},
{"link":"admin", "name": "Admin"}
diff --git a/web/warpauthWeb/views/main.py b/web/warpauthWeb/views/main.py
index dc0b69e5592d712191c1e46e794283246cc9c1a4..d3c8ee67b905abec9ddbb01d606da2a420b8fe1b 100644
--- a/web/warpauthWeb/views/main.py
+++ b/web/warpauthWeb/views/main.py
@@ -9,3 +9,4 @@ def index(request):
print(request.user.ldap_user.group_names)
return HttpResponse(render(request, 'about.html', pages))
+
diff --git a/web/warpauthWeb/views/warp_food.py b/web/warpauthWeb/views/warp_food.py
new file mode 100644
index 0000000000000000000000000000000000000000..d25ee117452a56f0a1106cfbf34327a4b0e4c595
--- /dev/null
+++ b/web/warpauthWeb/views/warp_food.py
@@ -0,0 +1,58 @@
+from django.shortcuts import render
+from django.http import HttpResponse, HttpResponseBadRequest, HttpResponseNotAllowed, HttpResponseNotFound
+from django.shortcuts import redirect
+from django.contrib.auth.decorators import login_required
+from warpauthWeb.util import *
+from warpauthWeb.models import *
+
+def index(request):
+ if request.method == 'POST':
+ form = FoodSheetForm(request.POST)
+ if form.is_valid:
+ form.save()
+ else:
+ pages['error'] = form.errors
+ pages['food_sheets'] = FoodSheet.objects.all()
+ pages['pizza_services'] = PizzaService.objects.all()
+ pages['create_food_sheet'] = FoodSheetForm()
+ return HttpResponse(render(request, 'warp_food/main.html', pages))
+
+def view(request, sheet_id=0):
+ if request.method == 'POST':
+ form = FoodOrderForm(request.POST)
+ if form.is_valid():
+ print(form.data)
+ form.save()
+
+ else:
+ pages['error'] = form.errors
+ print(pages['error'])
+
+ if sheet_id != 0:
+ sheet = FoodSheet.objects.get(id=sheet_id)
+ pages['sheet'] = sheet
+ pages['orders'] = FoodOrder.objects.filter(sheet=sheet)
+ sum = 0
+ for order in pages['orders']:
+ sum += order.price
+ pages['order_sum'] = sum
+ pages['create_food_order'] = FoodOrderForm(initial={'sheet': sheet_id, 'user': request.user.id})
+
+ return HttpResponse(render(request, 'warp_food/view.html', pages))
+
+@login_required(login_url='/login/', redirect_field_name=None)
+def toggle_closed(request, sheet_id=0):
+ if sheet_id != 0:
+ sheet = FoodSheet.objects.get(id=sheet_id)
+ sheet.closed = not sheet.closed
+ sheet.save()
+
+ return redirect("/pizza/view/%s" % (sheet_id))
+
+
+def toggle_paid(request, order_id=0):
+ if order_id != 0:
+ order = FoodOrder.objects.get(id=order_id)
+ order.paid = not order.paid
+ order.save()
+ return redirect("/pizza/view/%s" % (order.sheet.id))
\ No newline at end of file