diff --git a/.gitignore b/.gitignore index d7480c77dda62c22d0f3afebb7bd50f4301eebad..4af92734b9af8bdf9fe1ad2eb0242af6372902a8 100755 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ __pycache__ -env/ +venv/ *.pyc secure* .idea/workspace.xml diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml index bc559d1e0bfa8b6aa44f32b05f0f41d7ed618cb5..70aec478e3d08e8ec2f7c838d5636e0ca37b5aed 100755 --- a/.idea/dataSources.local.xml +++ b/.idea/dataSources.local.xml @@ -2,7 +2,7 @@ <project version="4"> <component name="dataSourceStorageLocal"> <data-source name="Django default" uuid="ef6730d6-e849-4772-acac-62469acab4d2"> - <database-info product="MySQL" version="5.7.20-0ubuntu0.16.04.1" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.44 ( Revision: b3cda4f864902ffdde495b9df93937c3e20009be )"> + <database-info product="MySQL" version="5.7.20-0ubuntu0.16.04.1" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.44 ( Revision: b3cda4f864902ffdde495b9df93937c3e20009be )" family="MYSQL" exact-version="5.7.20"> <extra-name-characters>#@</extra-name-characters> <identifier-quote-string>`</identifier-quote-string> </database-info> @@ -11,7 +11,7 @@ <introspection-schemas>*:schoolapps</introspection-schemas> </data-source> <data-source name="Django default2" uuid="ea4cff78-5949-410f-aa64-d6daa5fb293d"> - <database-info product="MySQL" version="5.7.21-0ubuntu0.16.04.1" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.44 ( Revision: b3cda4f864902ffdde495b9df93937c3e20009be )"> + <database-info product="MySQL" version="5.7.21-0ubuntu0.16.04.1" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.44 ( Revision: b3cda4f864902ffdde495b9df93937c3e20009be )" family="MYSQL" exact-version="5.7.21"> <extra-name-characters>#@</extra-name-characters> <identifier-quote-string>`</identifier-quote-string> </database-info> @@ -20,7 +20,7 @@ <introspection-schemas>*:schoolapps</introspection-schemas> </data-source> <data-source name="Django untis" uuid="ae145b31-953d-4d55-ad07-b49b3287f618"> - <database-info product="MySQL" version="5.7.21-0ubuntu0.16.04.1" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.44 ( Revision: b3cda4f864902ffdde495b9df93937c3e20009be )"> + <database-info product="MySQL" version="5.7.21-0ubuntu0.16.04.1" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.44 ( Revision: b3cda4f864902ffdde495b9df93937c3e20009be )" family="MYSQL" exact-version="5.7.21"> <extra-name-characters>#@</extra-name-characters> <identifier-quote-string>`</identifier-quote-string> </database-info> diff --git a/.idea/misc.xml b/.idea/misc.xml index ee192a2811e6e3c11be621e9a23d0afd10721d97..924f1208bf2eca4ebe2a80639dfbebf8004c892d 100755 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (school-apps)" project-jdk-type="Python SDK" /> + <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.7 (school-apps)" project-jdk-type="Python SDK" /> + <component name="PyCharmProfessionalAdvertiser"> + <option name="shown" value="true" /> + </component> </project> \ No newline at end of file diff --git a/.idea/school-apps.iml b/.idea/school-apps.iml index 58f0aa8547645e4983dc30f55766374164f5d257..f9b21f78ef36f5d4f373d0024ae46673e2200db4 100755 --- a/.idea/school-apps.iml +++ b/.idea/school-apps.iml @@ -15,8 +15,9 @@ <component name="NewModuleRootManager"> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/schoolapps" isTestSource="false" /> + <excludeFolder url="file://$MODULE_DIR$/venv" /> </content> - <orderEntry type="jdk" jdkName="Python 3.6 (school-apps)" jdkType="Python SDK" /> + <orderEntry type="jdk" jdkName="Python 3.7 (school-apps)" jdkType="Python SDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="jquery-3.2.1" level="application" /> <orderEntry type="module" module-name="bwinf-36-2" />