|
@@ -1,7 +1,17 @@
|
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
|
<project version="4">
|
|
|
<component name="ChangeListManager">
|
|
|
- <list default="true" id="5d56ca4e-fa09-4724-964f-713958f1a350" name="Default" comment="" />
|
|
|
+ <list default="true" id="5d56ca4e-fa09-4724-964f-713958f1a350" name="Default" comment="">
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/Niko_Public.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/Niko_Public.iml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/APP_data/db.sqlite3" beforeDir="false" afterPath="$PROJECT_DIR$/APP_data/db.sqlite3" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/checkIn/checkIn_media/qrcode/c_ID_5.png" beforeDir="false" afterPath="$PROJECT_DIR$/checkIn/checkIn_media/qrcode/c_ID_5.png" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/checkIn/templates/checkIn/addon/luckydraw.html" beforeDir="false" afterPath="$PROJECT_DIR$/checkIn/templates/checkIn/addon/luckydraw.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/checkIn/templates/checkIn/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/checkIn/templates/checkIn/index.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/checkIn/templates/checkIn/layout.html" beforeDir="false" afterPath="$PROJECT_DIR$/checkIn/templates/checkIn/layout.html" afterDir="false" />
|
|
|
+ <change beforePath="$PROJECT_DIR$/checkIn/templates/checkIn/user/checkIn.html" beforeDir="false" afterPath="$PROJECT_DIR$/checkIn/templates/checkIn/user/checkIn.html" afterDir="false" />
|
|
|
+ </list>
|
|
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
|
|
<option name="TRACKING_ENABLED" value="true" />
|
|
|
<option name="SHOW_DIALOG" value="false" />
|
|
@@ -10,46 +20,77 @@
|
|
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
|
</component>
|
|
|
<component name="FileEditorManager">
|
|
|
- <leaf>
|
|
|
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
|
|
|
<file leaf-file-name="trans_real.py" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/django/utils/translation/trans_real.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="116">
|
|
|
- <caret line="126" selection-start-line="126" selection-end-line="126" />
|
|
|
+ <state>
|
|
|
+ <caret line="115" selection-start-line="115" selection-end-line="115" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
- <file leaf-file-name="settings.py" pinned="false" current-in-tab="true">
|
|
|
+ <file leaf-file-name="settings.py" pinned="false" current-in-tab="false">
|
|
|
<entry file="file://$PROJECT_DIR$/Niko/settings.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="95">
|
|
|
- <caret line="124" column="24" selection-start-line="124" selection-start-column="24" selection-end-line="124" selection-end-column="24" />
|
|
|
+ <state>
|
|
|
+ <caret line="124" column="25" selection-start-line="124" selection-start-column="25" selection-end-line="124" selection-end-column="25" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="addonViews.py" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/checkIn/addonViews.py">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state>
|
|
|
+ <caret line="3" column="11" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="luckydraw.html" pinned="false" current-in-tab="false">
|
|
|
+ <entry file="file://$PROJECT_DIR$/checkIn/templates/checkIn/addon/luckydraw.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state>
|
|
|
+ <caret line="29" column="71" selection-start-line="29" selection-start-column="71" selection-end-line="29" selection-end-column="71" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ </file>
|
|
|
+ <file leaf-file-name="luckydrawResult.html" pinned="false" current-in-tab="true">
|
|
|
+ <entry file="file://$PROJECT_DIR$/checkIn/templates/checkIn/addon/luckydrawResult.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="224">
|
|
|
+ <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
</file>
|
|
|
</leaf>
|
|
|
</component>
|
|
|
+ <component name="Git.Settings">
|
|
|
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
|
+ </component>
|
|
|
<component name="IdeDocumentHistory">
|
|
|
<option name="CHANGED_PATHS">
|
|
|
<list>
|
|
|
<option value="$PROJECT_DIR$/Niko/settings.py" />
|
|
|
+ <option value="$PROJECT_DIR$/checkIn/templates/checkIn/addon/luckydraw.html" />
|
|
|
</list>
|
|
|
</option>
|
|
|
</component>
|
|
|
- <component name="ProjectFrameBounds">
|
|
|
+ <component name="ProjectFrameBounds" extendedState="6">
|
|
|
<option name="x" value="85" />
|
|
|
<option name="y" value="25" />
|
|
|
<option name="width" value="1750" />
|
|
|
<option name="height" value="970" />
|
|
|
</component>
|
|
|
+ <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
|
|
|
<component name="ProjectView">
|
|
|
<navigator proportions="" version="1">
|
|
|
<foldersAlwaysOnTop value="true" />
|
|
|
</navigator>
|
|
|
<panes>
|
|
|
- <pane id="Scope" />
|
|
|
<pane id="ProjectPane">
|
|
|
<subPane>
|
|
|
<expand>
|
|
@@ -60,16 +101,39 @@
|
|
|
<path>
|
|
|
<item name="Niko_Public" type="b2602c69:ProjectViewProjectNode" />
|
|
|
<item name="Niko_Public" type="462c0819:PsiDirectoryNode" />
|
|
|
- <item name="Niko" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="checkIn" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="Niko_Public" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="Niko_Public" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="checkIn" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="Niko_Public" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="Niko_Public" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="checkIn" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="checkIn" type="462c0819:PsiDirectoryNode" />
|
|
|
+ </path>
|
|
|
+ <path>
|
|
|
+ <item name="Niko_Public" type="b2602c69:ProjectViewProjectNode" />
|
|
|
+ <item name="Niko_Public" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="checkIn" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="templates" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="checkIn" type="462c0819:PsiDirectoryNode" />
|
|
|
+ <item name="addon" type="462c0819:PsiDirectoryNode" />
|
|
|
</path>
|
|
|
</expand>
|
|
|
<select />
|
|
|
</subPane>
|
|
|
</pane>
|
|
|
+ <pane id="Scope" />
|
|
|
</panes>
|
|
|
</component>
|
|
|
<component name="PropertiesComponent">
|
|
|
- <property name="last_opened_file_path" value="$PROJECT_DIR$/manage.py" />
|
|
|
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/Niko_env" />
|
|
|
+ <property name="settings.editor.selected.configurable" value="editor.preferences.fonts.default" />
|
|
|
</component>
|
|
|
<component name="RunDashboard">
|
|
|
<option name="ruleStates">
|
|
@@ -140,26 +204,25 @@
|
|
|
<servers />
|
|
|
</component>
|
|
|
<component name="ToolWindowManager">
|
|
|
- <frame x="68" y="20" width="1400" height="776" extended-state="0" />
|
|
|
- <editor active="true" />
|
|
|
+ <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
|
|
|
<layout>
|
|
|
- <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.24963924" />
|
|
|
+ <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.22526042" />
|
|
|
<window_info anchor="bottom" id="TODO" order="6" />
|
|
|
- <window_info anchor="bottom" id="Event Log" side_tool="true" />
|
|
|
- <window_info anchor="bottom" id="Run" order="2" />
|
|
|
- <window_info anchor="bottom" id="Version Control" show_stripe_button="false" />
|
|
|
- <window_info anchor="bottom" id="Python Console" />
|
|
|
+ <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
|
|
|
+ <window_info anchor="bottom" id="Version Control" order="7" />
|
|
|
+ <window_info anchor="bottom" id="Python Console" order="7" />
|
|
|
+ <window_info anchor="bottom" id="Run" order="2" weight="0.32872927" />
|
|
|
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
|
|
|
- <window_info anchor="bottom" id="Terminal" />
|
|
|
- <window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.39969835" />
|
|
|
- <window_info id="Favorites" side_tool="true" />
|
|
|
- <window_info anchor="bottom" id="Find" order="1" />
|
|
|
- <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
+ <window_info anchor="bottom" id="Terminal" order="7" />
|
|
|
+ <window_info id="Favorites" order="2" side_tool="true" />
|
|
|
+ <window_info anchor="bottom" id="Debug" order="3" weight="0.39917126" />
|
|
|
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
|
|
|
- <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
+ <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
|
|
|
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
|
|
|
<window_info anchor="bottom" id="Message" order="0" />
|
|
|
+ <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
|
|
|
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
|
|
|
+ <window_info anchor="bottom" id="Find" order="1" />
|
|
|
</layout>
|
|
|
</component>
|
|
|
<component name="VcsContentAnnotationSettings">
|
|
@@ -168,15 +231,134 @@
|
|
|
<component name="editorHistoryManager">
|
|
|
<entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/django/utils/translation/trans_real.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="116">
|
|
|
+ <state relative-caret-position="1380">
|
|
|
+ <caret line="115" selection-start-line="115" selection-end-line="115" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Niko/settings.py">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="1830">
|
|
|
+ <caret line="124" column="25" selection-start-line="124" selection-start-column="25" selection-end-line="124" selection-end-column="25" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/checkIn/addonViews.py">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="45">
|
|
|
+ <caret line="3" column="11" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/checkIn/templates/checkIn/addon/luckydraw.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="435">
|
|
|
+ <caret line="29" column="71" selection-start-line="29" selection-start-column="71" selection-end-line="29" selection-end-column="71" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/checkIn/templates/checkIn/addon/luckydrawResult.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="210">
|
|
|
+ <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/django/utils/translation/trans_real.py">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="1748">
|
|
|
+ <caret line="115" selection-start-line="115" selection-end-line="115" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Niko/settings.py">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="2356">
|
|
|
+ <caret line="124" column="25" selection-start-line="124" selection-start-column="25" selection-end-line="124" selection-end-column="25" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/checkIn/addonViews.py">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="57">
|
|
|
+ <caret line="3" column="11" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/checkIn/templates/checkIn/addon/luckydraw.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="551">
|
|
|
+ <caret line="29" column="71" selection-start-line="29" selection-start-column="71" selection-end-line="29" selection-end-column="71" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/checkIn/templates/checkIn/addon/luckydrawResult.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="437">
|
|
|
+ <caret line="23" column="86" selection-start-line="23" selection-start-column="32" selection-end-line="23" selection-end-column="86" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/django/utils/translation/trans_real.py">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="2394">
|
|
|
<caret line="126" selection-start-line="126" selection-end-line="126" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/checkIn/forms.py">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="19">
|
|
|
+ <caret line="1" selection-start-line="1" selection-end-line="1" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
<entry file="file://$PROJECT_DIR$/Niko/settings.py">
|
|
|
<provider selected="true" editor-type-id="text-editor">
|
|
|
- <state relative-caret-position="95">
|
|
|
- <caret line="124" column="24" selection-start-line="124" selection-start-column="24" selection-end-line="124" selection-end-column="24" />
|
|
|
+ <state relative-caret-position="2318">
|
|
|
+ <caret line="124" column="25" selection-start-line="124" selection-start-column="25" selection-end-line="124" selection-end-column="25" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$USER_HOME$/AppData/Local/Programs/Python/Python36/Lib/site-packages/django/utils/translation/trans_real.py">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state>
|
|
|
+ <caret line="115" selection-start-line="115" selection-end-line="115" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/checkIn/forms.py">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="19">
|
|
|
+ <caret line="1" selection-start-line="1" selection-end-line="1" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/Niko/settings.py">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state>
|
|
|
+ <caret line="124" column="25" selection-start-line="124" selection-start-column="25" selection-end-line="124" selection-end-column="25" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/checkIn/addonViews.py">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state>
|
|
|
+ <caret line="3" column="11" selection-start-line="3" selection-start-column="11" selection-end-line="3" selection-end-column="11" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/checkIn/templates/checkIn/addon/luckydraw.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state>
|
|
|
+ <caret line="29" column="71" selection-start-line="29" selection-start-column="71" selection-end-line="29" selection-end-column="71" />
|
|
|
+ </state>
|
|
|
+ </provider>
|
|
|
+ </entry>
|
|
|
+ <entry file="file://$PROJECT_DIR$/checkIn/templates/checkIn/addon/luckydrawResult.html">
|
|
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
+ <state relative-caret-position="224">
|
|
|
+ <caret line="14" column="13" selection-start-line="14" selection-start-column="13" selection-end-line="14" selection-end-column="13" />
|
|
|
</state>
|
|
|
</provider>
|
|
|
</entry>
|