diff --git a/.gitignore b/.gitignore
index 4135879260d59abbccc4ff157136add167f8e0b5..385ffac7739f08133b8797a930dd98e1b3d264ca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,21 @@
/.idea/workspace.xml
/.idea/workspace.xml
/studentview/.idea/workspace.xml
+/.idea/workspace.xml
+/gemeinsamforschen/.idea/.name
+/gemeinsamforschen/.idea/artifacts/gemeinsamforschen_war_exploded.xml
+/gemeinsamforschen/.idea/compiler.xml
+/gemeinsamforschen/.idea/copyright/profiles_settings.xml
+/gemeinsamforschen/.idea/dataSources.ids
+/gemeinsamforschen/.idea/dataSources.local.xml
+/gemeinsamforschen/.idea/dataSources.xml
+/gemeinsamforschen/.idea/deployment.xml
+/gemeinsamforschen/.idea/encodings.xml
+/gemeinsamforschen/.idea/misc.xml
+/gemeinsamforschen/.idea/modules.xml
+/gemeinsamforschen/.idea/workspace.xml
+/gemeinsamforschen/gemeinsamforschen.iml
+/studentview/.idea/workspace.xml
+/.idea/workspace.xml
+/.idea/workspace.xml
+/.idea/workspace.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6436660db3626bb15780b760db213138caed94f7..f6ba619eb5baea245c285e3efa0680c15e3f89f7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -46,10 +46,6 @@
<option name="myItemId" value="MySQL - fltrail@localhost" />
<option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="tags" />
- <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -65,6 +61,12 @@
<option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
</PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" />
+ <option name="myItemType" value="com.intellij.database.view.DatabaseStructure$Root" />
+ </PATH_ELEMENT>
+ </PATH>
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FavoritesManager">
@@ -72,127 +74,116 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
- <file leaf-file-name="fltrail.projects" pinned="false" current-in-tab="false">
- <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.projects">
+ <file leaf-file-name="config.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/database/config.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <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#6#92#0#PHP" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="fltrail.users" pinned="false" current-in-tab="false">
+ <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.users">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
<provider editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.0">
+ <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>
</file>
- <file leaf-file-name="styles.css" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/assets/css/styles.css">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-224.25807">
- <caret line="349" column="57" selection-start-line="349" selection-start-column="57" selection-end-line="349" selection-end-column="57" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="preferences.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/pages/preferences.php">
+ <file leaf-file-name="config.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/config.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-17.903225">
- <caret line="28" column="71" selection-start-line="28" selection-start-column="71" selection-end-line="28" selection-end-column="71" />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="2" column="71" selection-start-line="2" selection-start-column="71" selection-end-line="2" selection-end-column="71" />
<folding>
- <marker date="1523263995275" expanded="true" signature="182:256" placeholder="SELECT (`id`... projects" />
+ <element signature="n#!!doc" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="createPreferences.js" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/createPreferences.js">
+ <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/index.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.5120385">
- <caret line="111" column="54" selection-start-line="111" selection-start-column="54" selection-end-line="111" selection-end-column="54" />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="26" column="45" selection-start-line="26" selection-start-column="45" selection-end-line="26" selection-end-column="45" />
<folding>
- <marker date="1523268729248" expanded="true" signature="1662:1746" placeholder="..." />
- <marker date="1523268729248" expanded="true" signature="2816:3052" placeholder="..." />
- <marker date="1523268729248" expanded="true" signature="2817:3021" placeholder="..." />
- <marker date="1523268729248" expanded="true" signature="2817:3052" placeholder="..." />
- <marker date="1523268729248" expanded="true" signature="2844:2936" placeholder="..." />
- <marker date="1523268729248" expanded="true" signature="2995:3021" placeholder="..." />
+ <marker date="1522138768744" expanded="true" signature="1329:1388" placeholder="..." />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="putProject.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/database/putProject.php">
+ <file leaf-file-name="register.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/register.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-13.225806">
- <caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="24" column="98" selection-start-line="24" selection-start-column="98" selection-end-line="24" selection-end-column="98" />
<folding>
- <marker date="1522074655855" expanded="true" signature="751:946" placeholder="INSERT INTO `projects`... " />
- <marker date="1522074655855" expanded="true" signature="1001:1079" placeholder="INSERT INTO `tags`... " />
+ <marker date="1523350879136" expanded="true" signature="1833:1928" placeholder="..." />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="mygroups.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/pages/mygroups.php">
+ <file leaf-file-name="showProjects.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/showProjects.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-37.774193">
- <caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="31" column="38" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="myGroupsInit.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/myGroupsInit.js">
+ <file leaf-file-name="preferences.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/pages/preferences.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="95" column="19" selection-start-line="95" selection-start-column="19" selection-end-line="95" selection-end-column="19" />
+ <caret line="111" column="0" selection-start-line="111" selection-start-column="0" selection-end-line="111" selection-end-column="0" />
<folding>
- <marker date="1523263140884" expanded="true" signature="2619:2668" placeholder="..." />
+ <marker date="1523351341227" expanded="true" signature="182:256" placeholder="SELECT (`id`... projects" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="getProjects.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/database/getProjects.php">
+ <file leaf-file-name="overview.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/overview.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-14.903226">
- <caret line="21" column="4" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="60" />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="68" column="38" selection-start-line="68" selection-start-column="38" selection-end-line="68" selection-end-column="38" />
<folding>
- <marker date="1522147707095" expanded="true" signature="398:446" placeholder="SELECT * FRO... projects" />
+ <marker date="1523359889383" expanded="true" signature="872:1018" placeholder="..." />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="getAdresses.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/database/getAdresses.php">
+ <file leaf-file-name="projects.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/pages/projects.php">
<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>
- <marker date="1522074655851" expanded="true" signature="588:731" placeholder="SELECT name,... users" />
- </folding>
+ <state vertical-scroll-proportion="0.0">
+ <caret line="125" column="34" selection-start-line="125" selection-start-column="34" selection-end-line="125" selection-end-column="34" />
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="fltrail.users" pinned="false" current-in-tab="false">
- <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.users">
- <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
- <state>
- <filtering enabled="true" />
- </state>
- </provider>
- <provider editor-type-id="text-editor">
+ <file leaf-file-name="console.sql" pinned="false" current-in-tab="true">
+ <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/85944065-0254-4a61-b256-d3493cdb0a4f/console.sql">
+ <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 />
@@ -219,31 +210,35 @@
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/../../php/php.ini" />
- <option value="$PROJECT_DIR$/studentview/database/config.php" />
<option value="$PROJECT_DIR$/studentview/database/getProjects.php" />
<option value="$PROJECT_DIR$/studentview/database/getProjectsOfAuthor.php" />
- <option value="$PROJECT_DIR$/studentview/pages/newproject.php" />
- <option value="$PROJECT_DIR$/studentview/assets/js/newProject.js" />
<option value="$PROJECT_DIR$/studentview/assets/css/projects.css" />
- <option value="$PROJECT_DIR$/studentview/pages/enrollment.php" />
- <option value="$PROJECT_DIR$/studentview/pages/deleteProject.php" />
<option value="$APPLICATION_CONFIG_DIR$/consoles/db/14340c2c-ac4b-492f-ac4f-18c0853598a8/console_1.sql" />
<option value="$PROJECT_DIR$/studentview/database/deleteProject.php" />
<option value="$PROJECT_DIR$/studentview/assets/js/getProjects.js" />
- <option value="$PROJECT_DIR$/studentview/register.php" />
<option value="$PROJECT_DIR$/studentview/database/createUser.php" />
<option value="$PROJECT_DIR$/studentview/assets/css/Sidebar-Menu1.css" />
<option value="$PROJECT_DIR$/studentview/database/tokenSetter.php" />
<option value="$PROJECT_DIR$/studentview/pages/menu.php" />
<option value="dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.projects" />
- <option value="$PROJECT_DIR$/studentview/assets/js/deleteProject.js" />
- <option value="$PROJECT_DIR$/studentview/pages/projects.php" />
- <option value="$PROJECT_DIR$/studentview/assets/js/overview.js" />
+ <option value="$PROJECT_DIR$/studentview/assets/css/styles.css" />
+ <option value="$PROJECT_DIR$/dbschema/fltrail.sql" />
+ <option value="$PROJECT_DIR$/dbschema/createDummyUser.sql" />
+ <option value="$PROJECT_DIR$/studentview/database/getAdresses.php" />
<option value="$PROJECT_DIR$/studentview/pages/mygroups.php" />
<option value="$PROJECT_DIR$/studentview/assets/js/myGroupsInit.js" />
- <option value="$PROJECT_DIR$/studentview/pages/preferences.php" />
- <option value="$PROJECT_DIR$/studentview/assets/css/styles.css" />
<option value="$PROJECT_DIR$/studentview/assets/js/createPreferences.js" />
+ <option value="$PROJECT_DIR$/studentview/assets/js/deleteProject.js" />
+ <option value="$PROJECT_DIR$/studentview/assets/js/newProject.js" />
+ <option value="$PROJECT_DIR$/studentview/pages/deleteProject.php" />
+ <option value="$PROJECT_DIR$/studentview/pages/enrollment.php" />
+ <option value="$PROJECT_DIR$/studentview/pages/newproject.php" />
+ <option value="$PROJECT_DIR$/studentview/pages/projects.php" />
+ <option value="$PROJECT_DIR$/studentview/register.php" />
+ <option value="$PROJECT_DIR$/studentview/pages/preferences.php" />
+ <option value="$PROJECT_DIR$/studentview/assets/js/config.js" />
+ <option value="$PROJECT_DIR$/studentview/database/config.php" />
+ <option value="$PROJECT_DIR$/studentview/assets/js/overview.js" />
</list>
</option>
</component>
@@ -271,10 +266,10 @@
<component name="PhpWebServerValidation" path_to_validation_script="C:\dev\amp\htdocs\" selected_validation_type="LOCAL" web_path_to_validation_script="http://127.0.0.1/" />
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" interpreter_name="PHP" />
<component name="ProjectFrameBounds">
- <option name="x" value="-9" />
- <option name="y" value="-9" />
- <option name="width" value="2578" />
- <option name="height" value="1410" />
+ <option name="x" value="1" />
+ <option name="y" value="1" />
+ <option name="width" value="2135" />
+ <option name="height" value="1078" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
@@ -301,6 +296,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -309,165 +305,21 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="pages" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="database" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="assets" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="assets" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="js" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="assets" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="fonts" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="fltrail" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="assets" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="css" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</pane>
<pane id="Scope" />
<pane id="PackagesPane" />
- <pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="aspect.path.notification.shown" value="true" />
<property name="WebServerToolWindowFactoryState" value="true" />
<property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
- <property name="settings.editor.selected.configurable" value="configurable.group.other" />
+ <property name="settings.editor.selected.configurable" value="database.main" />
<property name="settings.editor.splitter.proportion" value="0.2" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../../php/php.exe" />
<property name="list.type.of.created.stylesheet" value="CSS" />
+ <property name="SearchEverywhereHistoryKey" value="	FILE	dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.users" />
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
@@ -976,33 +828,34 @@
<option name="number" value="Default" />
<updated>1522142632208</updated>
<workItem from="1522142635858" duration="32910000" />
- <workItem from="1522918322507" duration="18966000" />
+ <workItem from="1522918322507" duration="37691000" />
+ <workItem from="1524484938943" duration="2746000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="51876000" />
+ <option name="totallyTimeSpent" value="73347000" />
</component>
<component name="ToolWindowManager">
- <frame x="-9" y="-9" width="2578" height="1410" extended-state="6" />
- <editor active="true" />
+ <frame x="1" y="1" width="2135" height="1078" extended-state="1" />
+ <editor active="false" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23455825" sideWeight="0.47734374" order="8" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.35496482" sideWeight="0.71510416" order="2" 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" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3557394" sideWeight="0.71510416" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Sequence" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.45516202" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24335937" 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" show_stripe_button="true" weight="0.15742187" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.29428437" 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="true" show_stripe_button="true" weight="0.19036372" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.331509" sideWeight="0.52265626" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="true" content_ui="tabs" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.23455825" sideWeight="0.52265626" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -1015,7 +868,7 @@
<window_info id="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32994527" sideWeight="0.4984375" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2736513" sideWeight="0.6203125" order="1" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2736513" sideWeight="0.6203125" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="Vcs.Log.UiProperties">
@@ -1038,7 +891,7 @@
<option name="timeStamp" value="4" />
</line-breakpoint>
</breakpoints>
- <option name="time" value="18" />
+ <option name="time" value="47" />
</breakpoint-manager>
<watches-manager />
</component>
@@ -1047,34 +900,6 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/../../phpMyAdmin/version_check.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.49387756">
- <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../phpMyAdmin/db_structure.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.5387755">
- <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../phpMyAdmin/navigation.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.49387756">
- <caret line="13" column="0" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/14340c2c-ac4b-492f-ac4f-18c0853598a8/console.sql">
- <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" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/../../phpMyAdmin/server_databases.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.15742397">
@@ -1082,13 +907,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/dbschema/fltrail.sql">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.2983051">
- <caret line="8" column="47" selection-start-line="8" selection-start-column="47" selection-end-line="8" selection-end-column="47" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/../../phpMyAdmin/js/messages.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.71321696">
@@ -1103,13 +921,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/../../phpMyAdmin/js/get_scripts.js.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.2468828">
- <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/../../phpMyAdmin/sql.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.3840399">
@@ -1129,7 +940,6 @@
<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>
@@ -1150,13 +960,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/newproject.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.5723192">
- <caret line="72" column="47" selection-start-line="72" selection-start-column="47" selection-end-line="72" selection-end-column="47" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/studentview/database/putTagsAndPW.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-0.097256854">
@@ -1171,33 +974,10 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/enrollment.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.9837905">
- <caret line="44" column="18" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/studentview/assets/css/projects.css">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-17.741936">
<caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../phpMyAdmin/index.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-8.5161295">
- <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/newProject.js">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.44537815">
- <caret line="92" column="27" selection-start-line="92" selection-start-column="27" selection-end-line="92" selection-end-column="96" />
- <folding />
</state>
</provider>
</entry>
@@ -1220,82 +1000,77 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/userExists.php">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/register.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-9.225806">
- <caret line="18" column="29" selection-start-line="18" selection-start-column="10" selection-end-line="18" selection-end-column="29" />
+ <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" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/index.php">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/getProjects.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-18.451612">
- <caret line="26" column="45" selection-start-line="26" selection-start-column="45" selection-end-line="26" selection-end-column="45" />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="4" column="9" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/showProjects.js">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/css/Sidebar-Menu1.css">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="31" column="38" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
- <folding />
+ <state vertical-scroll-proportion="-5.352941">
+ <caret line="49" column="13" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/register.js">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/Sidebar-Menu.js">
<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$/studentview/register.php">
+ <entry file="file://$PROJECT_DIR$/studentview/database/tokenSetter.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-2.419355">
- <caret line="18" column="34" selection-start-line="18" selection-start-column="34" selection-end-line="18" selection-end-column="34" />
- <folding>
- <marker date="1523003628451" expanded="true" signature="1734:1829" placeholder="..." />
- </folding>
+ <state vertical-scroll-proportion="-12.064516">
+ <caret line="17" column="2" selection-start-line="17" selection-start-column="2" selection-end-line="17" selection-end-column="2" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/createUser.php">
+ <entry file="file://$PROJECT_DIR$/studentview/database/deleteProject.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-17.032259">
- <caret line="29" column="10" selection-start-line="29" selection-start-column="10" selection-end-line="29" selection-end-column="10" />
- <folding>
- <marker date="1523003632095" expanded="true" signature="346:402" placeholder="SELECT (u.to... users" />
- <marker date="1523003632095" expanded="true" signature="346:406" placeholder="SELECT (u.to... users" />
- <marker date="1523003632095" expanded="true" signature="346:409" placeholder="SELECT (u.to... users" />
- <marker date="1523003632095" expanded="true" signature="346:413" placeholder="SELECT (u.to... users" />
- <marker date="1523003632095" expanded="true" signature="346:414" placeholder="SELECT (u.to... users" />
- <marker date="1523003632095" expanded="true" signature="346:426" placeholder="SELECT (u.to... users" />
- <marker date="1523003632095" expanded="true" signature="346:427" placeholder="SELECT (u.to... users" />
- <marker date="1523003632095" expanded="true" signature="655:800" placeholder="INSERT INTO `users`... " />
- </folding>
+ <state vertical-scroll-proportion="-20.709677">
+ <caret line="35" column="42" selection-start-line="35" selection-start-column="42" selection-end-line="35" selection-end-column="42" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/getProjects.js">
+ <entry file="file://$PROJECT_DIR$/studentview/database/putProject.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="4" column="9" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
- <folding>
- <element signature="n#!!doc;n#getProjectsOfAuthor#0" expanded="false" />
- </folding>
+ <state vertical-scroll-proportion="-13.225806">
+ <caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/css/Sidebar-Menu1.css">
+ <entry file="file://$PROJECT_DIR$/studentview/database/getProjects.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-5.352941">
- <caret line="49" column="13" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
- <folding />
+ <state vertical-scroll-proportion="-14.903226">
+ <caret line="21" column="4" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="60" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/Sidebar-Menu.js">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/css/styles.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-224.25807">
+ <caret line="349" column="57" selection-start-line="349" selection-start-column="57" selection-end-line="349" selection-end-column="57" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/database/userExists.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-13.4838705">
+ <caret line="24" column="44" selection-start-line="24" selection-start-column="44" selection-end-line="24" selection-end-column="44" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/assets/egal.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" />
@@ -1303,202 +1078,226 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/config.php">
+ <entry file="file://$PROJECT_DIR$/studentview/database/createUser.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.07181719">
- <caret line="8" column="40" selection-start-line="8" selection-start-column="40" selection-end-line="8" selection-end-column="40" />
- <folding />
+ <state vertical-scroll-proportion="-4.967742">
+ <caret line="12" column="0" selection-start-line="33" selection-start-column="16" selection-end-line="34" selection-end-column="34" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/tokenSetter.php">
+ <entry file="file://$PROJECT_DIR$/../../phpMyAdmin/index.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-12.064516">
- <caret line="17" column="2" selection-start-line="17" selection-start-column="2" selection-end-line="17" selection-end-column="2" />
- <folding>
- <marker date="1523005013425" expanded="true" signature="152:218" placeholder="SELECT (`nam... users" />
- </folding>
+ <state vertical-scroll-proportion="-0.7096774">
+ <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/menu.php">
+ <entry file="file://$PROJECT_DIR$/../../phpMyAdmin/js/get_scripts.js.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-10.645162">
- <caret line="20" column="6" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
- <folding>
- <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#ul#0;n#div#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#h4#0;n#li#0;n#ul#0;n#div#0;n#!!top" expanded="true" />
- </folding>
+ <state vertical-scroll-proportion="-6.387097">
+ <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/deleteProject.php">
+ <entry file="file://$PROJECT_DIR$/dbschema/fltrail.sql">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-20.709677">
- <caret line="35" column="42" selection-start-line="35" selection-start-column="42" selection-end-line="35" selection-end-column="42" />
- <folding>
- <marker date="1522239553439" expanded="true" signature="444:496" placeholder="SELECT * FRO... projects" />
- <marker date="1522239553439" expanded="true" signature="444:546" placeholder="SELECT * FRO... projects" />
- <marker date="1522239553439" expanded="true" signature="759:861" placeholder="DELETE FROM " />
- <marker date="1522239553439" expanded="true" signature="924:962" placeholder="DELETE FROM " />
- <marker date="1522239553439" expanded="true" signature="924:977" placeholder="DELETE FROM " />
- <marker date="1522239553439" expanded="true" signature="924:979" placeholder="DELETE FROM " />
- </folding>
+ <state vertical-scroll-proportion="0.0">
+ <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/deleteProject.js">
+ <entry file="file://$PROJECT_DIR$/dbschema/createDummyUser.sql">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="14" column="161" selection-start-line="14" selection-start-column="161" selection-end-line="14" selection-end-column="161" />
- <folding>
- <element signature="e#0#42#0" expanded="false" />
- </folding>
+ <state vertical-scroll-proportion="-4.8292685">
+ <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/deleteProject.php">
+ <entry file="file://$PROJECT_DIR$/studentview/database/getAdresses.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-7.806452">
- <caret line="35" column="29" selection-start-line="35" selection-start-column="29" selection-end-line="35" selection-end-column="29" />
- <folding />
+ <state vertical-scroll-proportion="-18.419355">
+ <caret line="60" column="20" selection-start-line="60" selection-start-column="20" selection-end-line="60" selection-end-column="20" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/utility.js">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/myGroupsInit.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="0" column="9" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="9" />
- <folding />
+ <state vertical-scroll-proportion="-3.5211267">
+ <caret line="31" column="13" selection-start-line="31" selection-start-column="12" selection-end-line="31" selection-end-column="13" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/projects.php">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/utility.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-24.838709">
- <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
- <folding />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="0" column="9" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="9" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/overview.js">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/deleteProject.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="25" column="76" selection-start-line="25" selection-start-column="76" selection-end-line="25" selection-end-column="76" />
- <folding>
- <marker date="1523006332435" expanded="true" signature="872:1018" placeholder="..." />
- </folding>
+ <caret line="29" column="45" selection-start-line="29" selection-start-column="45" selection-end-line="29" selection-end-column="45" />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/putProject.php">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/newProject.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-13.225806">
- <caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
- <folding>
- <marker date="1522074655855" expanded="true" signature="751:946" placeholder="INSERT INTO `projects`... " />
- <marker date="1522074655855" expanded="true" signature="1001:1079" placeholder="INSERT INTO `tags`... " />
- </folding>
+ <state vertical-scroll-proportion="0.0">
+ <caret line="92" column="40" selection-start-line="92" selection-start-column="40" selection-end-line="92" selection-end-column="40" />
</state>
</provider>
</entry>
- <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.users">
+ <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.projects">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
<provider editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ <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$/studentview/database/getProjects.php">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/createPreferences.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-14.903226">
- <caret line="21" column="4" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="60" />
+ <state vertical-scroll-proportion="1.1205357">
+ <caret line="124" column="28" selection-start-line="124" selection-start-column="28" selection-end-line="124" selection-end-column="28" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/pages/deleteProject.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-13.4838705">
+ <caret line="19" column="50" selection-start-line="19" selection-start-column="50" selection-end-line="19" selection-end-column="50" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/pages/enrollment.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-9.741936">
+ <caret line="19" column="50" selection-start-line="19" selection-start-column="50" selection-end-line="19" selection-end-column="50" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/pages/menu.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-10.645162">
+ <caret line="20" column="6" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/pages/mygroups.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-7.096774">
+ <caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="50" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/pages/newproject.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-12.290322">
+ <caret line="21" column="50" selection-start-line="21" selection-start-column="50" selection-end-line="21" selection-end-column="50" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/index.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="26" column="45" selection-start-line="26" selection-start-column="45" selection-end-line="26" selection-end-column="45" />
<folding>
- <marker date="1522147707095" expanded="true" signature="398:446" placeholder="SELECT * FRO... projects" />
+ <marker date="1522138768744" expanded="true" signature="1329:1388" placeholder="..." />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/getAdresses.php">
+ <entry file="file://$PROJECT_DIR$/studentview/register.php">
<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="24" column="98" selection-start-line="24" selection-start-column="98" selection-end-line="24" selection-end-column="98" />
<folding>
- <marker date="1522074655851" expanded="true" signature="588:731" placeholder="SELECT name,... users" />
+ <marker date="1523350879136" expanded="true" signature="1833:1928" placeholder="..." />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/mygroups.php">
+ <entry file="file://$PROJECT_DIR$/studentview/pages/preferences.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-37.774193">
- <caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="111" column="0" selection-start-line="111" selection-start-column="0" selection-end-line="111" selection-end-column="0" />
+ <folding>
+ <marker date="1523351341227" expanded="true" signature="182:256" placeholder="SELECT (`id`... projects" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/config.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="2" column="71" selection-start-line="2" selection-start-column="71" selection-end-line="2" selection-end-column="71" />
+ <folding>
+ <element signature="n#!!doc" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/showProjects.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="31" column="38" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
- <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.projects">
+ <entry file="file://$PROJECT_DIR$/studentview/pages/projects.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="125" column="34" selection-start-line="125" selection-start-column="34" selection-end-line="125" selection-end-column="34" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.users">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
<provider editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.0">
+ <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$/studentview/assets/js/myGroupsInit.js">
+ <entry file="file://$PROJECT_DIR$/studentview/database/config.php">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="95" column="19" selection-start-line="95" selection-start-column="19" selection-end-line="95" selection-end-column="19" />
+ <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
<folding>
- <marker date="1523263140884" expanded="true" signature="2619:2668" placeholder="..." />
+ <element signature="e#6#92#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/preferences.php">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/overview.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-17.903225">
- <caret line="28" column="71" selection-start-line="28" selection-start-column="71" selection-end-line="28" selection-end-column="71" />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="68" column="38" selection-start-line="68" selection-start-column="38" selection-end-line="68" selection-end-column="38" />
<folding>
- <marker date="1523263995275" expanded="true" signature="182:256" placeholder="SELECT (`id`... projects" />
+ <marker date="1523359889383" expanded="true" signature="872:1018" placeholder="..." />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/css/styles.css">
+ <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/85944065-0254-4a61-b256-d3493cdb0a4f/console.sql">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-224.25807">
- <caret line="349" column="57" selection-start-line="349" selection-start-column="57" selection-end-line="349" selection-end-column="57" />
+ <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$/studentview/assets/js/createPreferences.js">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.5120385">
- <caret line="111" column="54" selection-start-line="111" selection-start-column="54" selection-end-line="111" selection-end-column="54" />
- <folding>
- <marker date="1523268729248" expanded="true" signature="1662:1746" placeholder="..." />
- <marker date="1523268729248" expanded="true" signature="2816:3052" placeholder="..." />
- <marker date="1523268729248" expanded="true" signature="2817:3021" placeholder="..." />
- <marker date="1523268729248" expanded="true" signature="2817:3052" placeholder="..." />
- <marker date="1523268729248" expanded="true" signature="2844:2936" placeholder="..." />
- <marker date="1523268729248" expanded="true" signature="2995:3021" placeholder="..." />
- </folding>
- </state>
- </provider>
- </entry>
</component>
</project>
\ No newline at end of file
diff --git a/gemeinsamforschen/out/artifacts/gemeinsamforschen_war_exploded/META-INF/MANIFEST.MF b/gemeinsamforschen/out/artifacts/gemeinsamforschen_war_exploded/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..6f4dfaeeaf5a652379cfe8a9ddaaf65c7a7ded92
--- /dev/null
+++ b/gemeinsamforschen/out/artifacts/gemeinsamforschen_war_exploded/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Built-By: dehne
+Created-By: IntelliJ IDEA
+Build-Jdk: 1.8.0_101
+
diff --git a/gemeinsamforschen/out/artifacts/gemeinsamforschen_war_exploded/WEB-INF/web.xml b/gemeinsamforschen/out/artifacts/gemeinsamforschen_war_exploded/WEB-INF/web.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a0b58fd42a98ab23ed9561a991b01bdc629feab1
--- /dev/null
+++ b/gemeinsamforschen/out/artifacts/gemeinsamforschen_war_exploded/WEB-INF/web.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
+</web-app>
\ No newline at end of file
diff --git a/gemeinsamforschen/out/artifacts/gemeinsamforschen_war_exploded/index.html b/gemeinsamforschen/out/artifacts/gemeinsamforschen_war_exploded/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..b72f7a2e831667d1116d3b3771bbfb1c8270415f
--- /dev/null
+++ b/gemeinsamforschen/out/artifacts/gemeinsamforschen_war_exploded/index.html
@@ -0,0 +1,9 @@
+
+<html>
+ <head>
+ <title>Gemeinsam Forschen</title>
+ </head>
+ <body>
+ Krasse Website
+ </body>
+</html>
diff --git a/gemeinsamforschen/pom.xml b/gemeinsamforschen/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..15b68ab646521958d6e278b459e6ec49f703b3a4
--- /dev/null
+++ b/gemeinsamforschen/pom.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>groupId</groupId>
+ <artifactId>gemeinsamforschen</artifactId>
+ <version>1.0-SNAPSHOT</version>
+
+
+</project>
\ No newline at end of file
diff --git a/gemeinsamforschen/src/scripts/munschkins.sql b/gemeinsamforschen/src/scripts/munschkins.sql
new file mode 100644
index 0000000000000000000000000000000000000000..edb95a9d77c4454e66cfccb6f216126b8fd92d58
--- /dev/null
+++ b/gemeinsamforschen/src/scripts/munschkins.sql
@@ -0,0 +1,10 @@
+CREATE TABLE IF NOT EXISTS Munschkins (
+ MunschkinId int,
+ LastName varchar(255),
+ FirstName varchar(255),
+ BadThings varchar(255),
+ Strength int
+);
+
+INSERT INTO `Munschkins` (MunschkinId, LastName, FirstName, BadThings, Strength) values(1, "Thor", "Theodor", "he
+will eat your feet", 5);
\ No newline at end of file
diff --git a/gemeinsamforschen/web/WEB-INF/web.xml b/gemeinsamforschen/web/WEB-INF/web.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a0b58fd42a98ab23ed9561a991b01bdc629feab1
--- /dev/null
+++ b/gemeinsamforschen/web/WEB-INF/web.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
+ version="3.1">
+</web-app>
\ No newline at end of file
diff --git a/gemeinsamforschen/web/index.html b/gemeinsamforschen/web/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..b72f7a2e831667d1116d3b3771bbfb1c8270415f
--- /dev/null
+++ b/gemeinsamforschen/web/index.html
@@ -0,0 +1,9 @@
+
+<html>
+ <head>
+ <title>Gemeinsam Forschen</title>
+ </head>
+ <body>
+ Krasse Website
+ </body>
+</html>
diff --git a/studentview/.idea/workspace.xml b/studentview/.idea/workspace.xml
index 342a0ed6fa7b1c1a0d0f6006ccf0d0432b82f668..213aa295ca3d34f35fd4ed8b6a83348e36bf6a31 100644
--- a/studentview/.idea/workspace.xml
+++ b/studentview/.idea/workspace.xml
@@ -5,6 +5,7 @@
<ignored path="studentview.iws" />
<ignored path=".idea/workspace.xml" />
<ignored path="$PROJECT_DIR$/out/" />
+ <ignored path=".idea/dataSources.local.xml" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -37,8 +38,8 @@
<component name="ProjectFrameBounds">
<option name="x" value="-9" />
<option name="y" value="-9" />
- <option name="width" value="1938" />
- <option name="height" value="1050" />
+ <option name="width" value="2578" />
+ <option name="height" value="1410" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
@@ -65,9 +66,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scratches" />
- <pane id="Scope" />
- <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -88,6 +86,9 @@
</PATH>
</subPane>
</pane>
+ <pane id="Scratches" />
+ <pane id="Scope" />
+ <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -587,14 +588,17 @@
<workItem from="1522142603790" duration="30000" />
<workItem from="1522913635645" duration="807000" />
<workItem from="1522918310016" duration="8000" />
+ <workItem from="1523624074412" duration="580000" />
+ <workItem from="1524311546205" duration="598000" />
+ <workItem from="1524484820622" duration="296000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="885000" />
+ <option name="totallyTimeSpent" value="2359000" />
</component>
<component name="ToolWindowManager">
- <frame x="-9" y="-9" width="1938" height="1050" extended-state="6" />
+ <frame x="-9" y="-9" width="2578" height="1410" extended-state="6" />
<editor active="false" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -606,7 +610,7 @@
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="9" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
- <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33072916" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.5015625" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
diff --git a/studentview/database/config.php b/studentview/database/config.php
index b350864e60320db20c45ac6a4dd024eaf2edec3d..f5ed444e9e87fe52c7892ae791f76fe2e2b2695b 100644
--- a/studentview/database/config.php
+++ b/studentview/database/config.php
@@ -6,5 +6,5 @@
* Time: 12:38
*/
-//$db = mysqli_connect("localhost", "root2", "voyager2", "fltrail");
-$db = mysqli_connect("localhost", "root", "voyager", "fltrail");
+$db = mysqli_connect("localhost", "root2", "voyager2", "fltrail");
+//$db = mysqli_connect("localhost", "root", "voyager", "fltrail");