diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..714c58caad2c08dbaa447e4f43bb29e6ab151b76
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,14 @@
+/.idea/.name
+/.idea/compiler.xml
+/.idea/copyright/profiles_settings.xml
+/.idea/dataSources.ids
+/.idea/dataSources.local.xml
+/.idea/dataSources.xml
+/.idea/deployment.xml
+/.idea/encodings.xml
+/.idea/misc.xml
+/.idea/modules.xml
+/.idea/sqldialects.xml
+/.idea/workspace.xml
+/fltrail.iml
+/.idea/workspace.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1a62e093770833f4feedea1b480a82728b544697..0c15c9cb2e39a03c8a501cf4a411f819bc885242 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="0be454bf-c7dc-4169-b85d-3f5b67d335c0" name="Default" comment="" />
+ <list default="true" id="b207c042-3fc9-4102-bf50-ee6c9b45c20d" name="Default" comment="" />
<ignored path="fltrail.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" />
@@ -16,106 +17,166 @@
<component name="CreatePatchCommitExecutor">
<option name="PATCH_PATH" value="" />
</component>
+ <component name="DatabaseView">
+ <option name="GROUP_SCHEMA" value="true" />
+ <option name="GROUP_CONTENTS" value="false" />
+ <option name="SORT_POSITIONED" value="false" />
+ <option name="SHOW_TABLE_DETAILS" value="true" />
+ <option name="SHOW_EMPTY_GROUPS" value="false" />
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" />
+ <option name="myItemType" value="com.intellij.database.view.DatabaseStructure$Root" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MySQL - fltrail@localhost" />
+ <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_ELEMENT>
+ <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>
+ <option name="myItemId" />
+ <option name="myItemType" value="com.intellij.database.view.DatabaseStructure$Root" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="MySQL - fltrail@localhost" />
+ <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="projects" />
+ <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
+ </PATH_ELEMENT>
+ </PATH>
+ </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FavoritesManager">
<favorites_list name="fltrail" />
</component>
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="createUser.php" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/studentview/database/createUser.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.52510285">
- <caret line="29" column="1" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
- <folding>
- <element signature="e#6#92#0#PHP" expanded="true" />
- <marker date="1519643596337" expanded="true" signature="322:370" placeholder="SELECT (u.em... users" />
- <marker date="1519643596337" expanded="true" signature="322:382" placeholder="SELECT (u.em... users" />
- <marker date="1519643596337" expanded="true" signature="589:688" placeholder="SELECT (u.to... users" />
- <marker date="1519643596337" expanded="true" signature="917:984" placeholder="INSERT INTO `users`... " />
- <marker date="1519643596337" expanded="true" signature="917:985" placeholder="INSERT INTO `users`... " />
- <marker date="1519643596337" expanded="true" signature="917:1001" placeholder="INSERT INTO `users`... " />
- <marker date="1519643596337" expanded="true" signature="917:1021" placeholder="INSERT INTO `users`... " />
- <marker date="1519643596337" expanded="true" signature="917:1058" placeholder="INSERT INTO `users`... " />
- <marker date="1519643596337" expanded="true" signature="917:1059" placeholder="INSERT INTO `users`... " />
- </folding>
+ <state vertical-scroll-proportion="4.967742">
+ <caret line="29" column="42" selection-start-line="29" selection-start-column="42" selection-end-line="29" selection-end-column="42" />
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="userExists.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/database/userExists.php">
+ <file leaf-file-name="overview.js" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/overview.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.5232163">
+ <caret line="21" column="75" selection-start-line="21" selection-start-column="75" selection-end-line="21" selection-end-column="75" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="fltrail.tags" pinned="false" current-in-tab="false">
+ <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.tags">
+ <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">
+ <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="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">
+ <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="fltrail.projects" pinned="false" current-in-tab="false">
+ <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">
+ <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="getProjectsOfAuthor.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/database/getProjectsOfAuthor.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-9.935484">
- <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="22" selection-end-column="1" />
+ <state vertical-scroll-proportion="-8.32258">
+ <caret line="16" column="29" selection-start-line="15" selection-start-column="0" selection-end-line="16" selection-end-column="29" />
<folding>
<element signature="e#6#92#0#PHP" expanded="true" />
- <marker date="1519639068104" expanded="true" signature="219:282" placeholder="SELECT (`pas... users" />
- <marker date="1519639068104" expanded="true" signature="219:286" placeholder="SELECT (`pas... users" />
- <marker date="1519639068104" expanded="true" signature="219:299" placeholder="SELECT (`pas... users" />
- <marker date="1519639068104" expanded="true" signature="219:314" placeholder="SELECT (u.to... users" />
+ <marker date="1522152079040" expanded="true" signature="425:487" placeholder="SELECT * FRO... projects" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="overview.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/pages/overview.php">
+ <file leaf-file-name="userExists.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/database/userExists.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-1.5098039">
- <caret line="7" column="49" selection-start-line="7" selection-start-column="49" selection-end-line="7" selection-end-column="49" />
+ <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" />
<folding>
- <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#h3#0;n#li#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#a#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#li#2;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#a#0;n#li#2;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#li#3;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#a#0;n#li#3;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#h3#0;n#li#0;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#li#1;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#a#0;n#li#1;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#li#2;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#a#0;n#li#2;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#li#3;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#a#0;n#li#3;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <marker date="1519639344138" expanded="true" signature="76:115" placeholder="..." />
- <marker date="1519639344138" expanded="true" signature="128:194" placeholder="SELECT (`nam... users" />
+ <marker date="1522074655864" expanded="true" signature="219:314" placeholder="SELECT (u.to... users" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="index.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/index.php">
+ <file leaf-file-name="getAdresses.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/database/getAdresses.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-22.709677">
- <caret line="32" column="14" selection-start-line="26" selection-start-column="12" selection-end-line="32" selection-end-column="14" />
+ <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="1519643459904" expanded="true" signature="1376:1435" placeholder="..." />
+ <marker date="1522074655851" expanded="true" signature="588:731" placeholder="SELECT name,... users" />
</folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="register.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/register.php">
+ <file leaf-file-name="getTags.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/database/getTags.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-21.290323">
- <caret line="30" column="38" selection-start-line="30" selection-start-column="38" selection-end-line="30" selection-end-column="38" />
+ <state vertical-scroll-proportion="-17.741936">
+ <caret line="25" column="5" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
<folding>
- <marker date="1519643468369" expanded="true" signature="1758:1827" placeholder="..." />
+ <marker date="1522074655854" expanded="true" signature="336:391" placeholder="SELECT * FRO... tags" />
</folding>
</state>
</provider>
@@ -123,13 +184,6 @@
</file>
</leaf>
</component>
- <component name="FileTemplateManagerImpl">
- <option name="RECENT_TEMPLATES">
- <list>
- <option value="JavaScript File" />
- </list>
- </option>
- </component>
<component name="GradleLocalSettings">
<option name="externalProjectsViewState">
<projects_view />
@@ -138,16 +192,15 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
- <option value="$PROJECT_DIR$/studentview/database/userCorrect.php" />
- <option value="$PROJECT_DIR$/studentview/index.html" />
- <option value="$PROJECT_DIR$/studentview/assets/js/login.js" />
- <option value="$PROJECT_DIR$/studentview/register.html" />
+ <option value="$PROJECT_DIR$/../../php/php.ini" />
<option value="$PROJECT_DIR$/studentview/database/config.php" />
- <option value="$PROJECT_DIR$/studentview/index.php" />
- <option value="$PROJECT_DIR$/studentview/database/userExists.php" />
- <option value="$PROJECT_DIR$/studentview/pages/overview.php" />
- <option value="$PROJECT_DIR$/studentview/register.php" />
- <option value="$PROJECT_DIR$/studentview/database/createUser.php" />
+ <option value="$PROJECT_DIR$/studentview/database/getProjects.php" />
+ <option value="dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.projects" />
+ <option value="$PROJECT_DIR$/studentview/pages/projects.php" />
+ <option value="$PROJECT_DIR$/studentview/assets/js/newProject.js" />
+ <option value="$PROJECT_DIR$/studentview/pages/newproject.php" />
+ <option value="$PROJECT_DIR$/studentview/database/getProjectsOfAuthor.php" />
+ <option value="$PROJECT_DIR$/studentview/assets/js/overview.js" />
</list>
</option>
</component>
@@ -156,9 +209,18 @@
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
</component>
+ <component name="PhpDebugGeneral" notify_if_session_was_finished_without_being_paused="false" />
<component name="PhpServers">
- <servers />
+ <servers>
+ <server host="localhost/fltrail/studentview" id="0689838e-2d6d-4149-9413-e6535e936a72" name="Localhost">
+ <path_mappings>
+ <mapping local-root="$PROJECT_DIR$" remote-root="/fltrail/studentview" />
+ </path_mappings>
+ </server>
+ <server host="localhost" id="75f2248a-2fea-4485-9fd7-0dc130516437" name="localhost" />
+ </servers>
</component>
+ <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" />
@@ -201,6 +263,16 @@
<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" />
@@ -260,6 +332,50 @@
<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="dbschema" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
</subPane>
</pane>
@@ -268,14 +384,13 @@
</component>
<component name="PropertiesComponent">
<property name="aspect.path.notification.shown" value="true" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
<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.splitter.proportion" value="0.2" />
+ <property name="last_opened_file_path" value="$PROJECT_DIR$/../../php/php.exe" />
</component>
- <component name="RunManager" selected="PHP Script.createUser.php">
- <configuration default="false" name="createUser.php" type="PhpLocalRunConfigurationType" factoryName="PHP Console" temporary="true" path="$PROJECT_DIR$/studentview/database/createUser.php">
- <method />
- </configuration>
+ <component name="RunManager" selected="PHP Web Application.test">
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
<module name="" />
<option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
@@ -615,6 +730,9 @@
<configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
<method />
</configuration>
+ <configuration default="true" type="PhpWebAppRunConfigurationType" factoryName="PHP Web Application" server_name="Localhost">
+ <method />
+ </configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -745,14 +863,16 @@
<envs />
<method />
</configuration>
- <list size="1">
- <item index="0" class="java.lang.String" itemvalue="PHP Script.createUser.php" />
+ <configuration default="false" name="phpserver" type="PhpWebAppRunConfigurationType" factoryName="PHP Web Application" server_name="Localhost" start_url="/index.php">
+ <method />
+ </configuration>
+ <configuration default="false" name="test" type="PhpWebAppRunConfigurationType" factoryName="PHP Web Application" server_name="Localhost" start_url="/test.php">
+ <method />
+ </configuration>
+ <list size="2">
+ <item index="0" class="java.lang.String" itemvalue="PHP Web Application.phpserver" />
+ <item index="1" class="java.lang.String" itemvalue="PHP Web Application.test" />
</list>
- <recent_temporary>
- <list size="1">
- <item index="0" class="java.lang.String" itemvalue="PHP Script.createUser.php" />
- </list>
- </recent_temporary>
</component>
<component name="SbtLocalSettings">
<option name="externalProjectsViewState">
@@ -762,16 +882,16 @@
<component name="ShelveChangesManager" show_recycled="false" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
- <changelist id="0be454bf-c7dc-4169-b85d-3f5b67d335c0" name="Default" comment="" />
- <created>1519386118701</created>
+ <changelist id="b207c042-3fc9-4102-bf50-ee6c9b45c20d" name="Default" comment="" />
+ <created>1522142632208</created>
<option name="number" value="Default" />
- <updated>1519386118701</updated>
- <workItem from="1519386120301" duration="11498000" />
+ <updated>1522142632208</updated>
+ <workItem from="1522142635858" duration="10726000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="11498000" />
+ <option name="totallyTimeSpent" value="10726000" />
</component>
<component name="ToolWindowManager">
<frame x="-9" y="-9" width="2578" height="1410" extended-state="6" />
@@ -779,21 +899,21 @@
<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.41522232" sideWeight="0.37773436" order="8" 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" show_stripe_button="true" weight="0.28381547" sideWeight="0.3796875" 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="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.3564431" sideWeight="0.7210938" order="2" 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.33085936" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.41522232" sideWeight="0.62226564" order="1" 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.24804688" 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.24765626" sideWeight="0.5" order="4" 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.28381547" sideWeight="0.6203125" 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" 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="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.42803314" sideWeight="0.5335938" order="3" 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.32290852" sideWeight="0.5296875" 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" />
@@ -807,140 +927,320 @@
<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" />
</layout>
</component>
- <component name="Vcs.Log.UiProperties">
- <option name="RECENTLY_FILTERED_USER_GROUPS">
- <collection />
- </option>
- <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
- <collection />
- </option>
- </component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
- <option name="time" value="1" />
+ <breakpoints>
+ <line-breakpoint enabled="true" type="php">
+ <url>file://$PROJECT_DIR$/studentview/test.php</url>
+ <line>10</line>
+ <option name="timeStamp" value="4" />
+ </line-breakpoint>
+ </breakpoints>
+ <option name="time" value="6" />
</breakpoint-manager>
<watches-manager />
</component>
+ <component name="antWorkspaceConfiguration">
+ <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" />
+ <option name="FILTER_TARGETS" value="false" />
+ </component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/studentview/pages/overview.php">
+ <entry file="file://$PROJECT_DIR$/../../php/php.ini">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-1.5098039">
- <caret line="7" column="49" selection-start-line="7" selection-start-column="49" selection-end-line="7" selection-end-column="49" />
+ <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$/../../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" />
+ <folding />
+ </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" />
+ <folding />
+ </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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/../../phpMyAdmin/index.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.5387755">
+ <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
<folding>
- <element signature="n#style#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#h3#0;n#li#0;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#a#0;n#li#1;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#li#2;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#a#0;n#li#2;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#li#3;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#a#0;n#li#3;n#ul#0;n#div#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#h3#0;n#li#0;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#li#1;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#a#0;n#li#1;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#li#2;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#a#0;n#li#2;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#li#3;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#a#0;n#li#3;n#ul#0;n#div#1;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#tr#0;n#tbody#0;n#table#0;n#div#1;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#2;n#div#0;n#div#2;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
- <marker date="1519639344138" expanded="true" signature="76:115" placeholder="..." />
- <marker date="1519639344138" expanded="true" signature="128:194" placeholder="SELECT (`nam... users" />
+ <marker date="1520264232000" expanded="true" signature="4453:4480" placeholder="..." />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/myGroupsInit.js">
+ <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" />
+ <folding />
+ </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.052969504">
- <caret line="3" column="0" selection-start-line="3" selection-start-column="0" selection-end-line="7" selection-end-column="3" />
+ <state vertical-scroll-proportion="0.15742397">
+ <caret line="4" column="10" selection-start-line="4" selection-start-column="10" selection-end-line="4" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/register.js">
+ <entry file="file://$PROJECT_DIR$/dbschema/fltrail.sql">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.052969504">
- <caret line="5" column="7" selection-start-line="5" selection-start-column="7" selection-end-line="5" selection-end-column="7" />
+ <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" />
+ <folding />
+ </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">
+ <caret line="26" column="0" selection-start-line="26" selection-start-column="0" selection-end-line="26" selection-end-column="0" />
<folding>
- <element signature="e#0#42#0" expanded="false" />
+ <marker date="1520264232000" expanded="true" signature="31125:31142" placeholder="..." />
+ <marker date="1520264232000" expanded="true" signature="31274:31291" placeholder="..." />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/config.php">
+ <entry file="file://$PROJECT_DIR$/../../phpMyAdmin/js/whitelist.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.16296296">
+ <state vertical-scroll-proportion="0.21945137">
+ <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+ <folding />
+ </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" />
+ <folding />
+ </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">
+ <caret line="17" column="0" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/test.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.13715711">
+ <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/pages/newproject.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="15.096774">
+ <caret line="35" column="6" selection-start-line="35" selection-start-column="6" selection-end-line="35" selection-end-column="6" />
<folding>
- <element signature="e#6#92#0#PHP" expanded="true" />
+ <element signature="n#style#0;n#button#0;n#div#8;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
+ </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.0">
+ <caret line="61" column="55" selection-start-line="61" selection-start-column="55" selection-end-line="61" selection-end-column="55" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/Customizable-Carousel-swipe-enabled.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/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/assets/js/jquery.min.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>
+ <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="29" column="37" selection-start-line="29" selection-start-column="37" selection-end-line="29" selection-end-column="37" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <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="18" column="63" selection-start-line="18" selection-start-column="48" selection-end-line="18" selection-end-column="63" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/database/config.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.07746479">
+ <caret line="8" column="40" selection-start-line="8" selection-start-column="40" selection-end-line="8" selection-end-column="40" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/database/getAdresses.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>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/index.php">
+ <entry file="file://$PROJECT_DIR$/studentview/database/getTags.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-22.709677">
- <caret line="32" column="14" selection-start-line="26" selection-start-column="12" selection-end-line="32" selection-end-column="14" />
+ <state vertical-scroll-proportion="-17.741936">
+ <caret line="25" column="5" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
<folding>
- <marker date="1519643459904" expanded="true" signature="1376:1435" placeholder="..." />
+ <marker date="1522074655854" expanded="true" signature="336:391" placeholder="SELECT * FRO... tags" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/register.php">
+ <entry file="file://$PROJECT_DIR$/studentview/database/getProjects.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-21.290323">
- <caret line="30" column="38" selection-start-line="30" selection-start-column="38" selection-end-line="30" selection-end-column="38" />
+ <state vertical-scroll-proportion="-24.129032">
+ <caret line="34" column="22" selection-start-line="20" selection-start-column="1" selection-end-line="34" selection-end-column="22" />
<folding>
- <marker date="1519643468369" expanded="true" signature="1758:1827" placeholder="..." />
+ <marker date="1522147707095" expanded="true" signature="398:446" placeholder="SELECT * FRO... projects" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/userExists.php">
+ <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">
+ <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="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">
+ <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/getProjectsOfAuthor.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-9.935484">
- <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="22" selection-end-column="1" />
+ <state vertical-scroll-proportion="-8.32258">
+ <caret line="16" column="29" selection-start-line="15" selection-start-column="0" selection-end-line="16" selection-end-column="29" />
<folding>
<element signature="e#6#92#0#PHP" expanded="true" />
- <marker date="1519639068104" expanded="true" signature="219:282" placeholder="SELECT (`pas... users" />
- <marker date="1519639068104" expanded="true" signature="219:286" placeholder="SELECT (`pas... users" />
- <marker date="1519639068104" expanded="true" signature="219:299" placeholder="SELECT (`pas... users" />
- <marker date="1519639068104" expanded="true" signature="219:314" placeholder="SELECT (u.to... users" />
+ <marker date="1522152079040" expanded="true" signature="425:487" placeholder="SELECT * FRO... projects" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/createUser.php">
+ <entry file="file://$PROJECT_DIR$/studentview/database/putTagsAndPW.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.52510285">
- <caret line="29" column="1" selection-start-line="29" selection-start-column="1" selection-end-line="29" selection-end-column="1" />
+ <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>
- <element signature="e#6#92#0#PHP" expanded="true" />
- <marker date="1519643596337" expanded="true" signature="322:370" placeholder="SELECT (u.em... users" />
- <marker date="1519643596337" expanded="true" signature="322:382" placeholder="SELECT (u.em... users" />
- <marker date="1519643596337" expanded="true" signature="589:688" placeholder="SELECT (u.to... users" />
- <marker date="1519643596337" expanded="true" signature="917:984" placeholder="INSERT INTO `users`... " />
- <marker date="1519643596337" expanded="true" signature="917:985" placeholder="INSERT INTO `users`... " />
- <marker date="1519643596337" expanded="true" signature="917:1001" placeholder="INSERT INTO `users`... " />
- <marker date="1519643596337" expanded="true" signature="917:1021" placeholder="INSERT INTO `users`... " />
- <marker date="1519643596337" expanded="true" signature="917:1058" placeholder="INSERT INTO `users`... " />
- <marker date="1519643596337" expanded="true" signature="917:1059" placeholder="INSERT INTO `users`... " />
+ <marker date="1522074655857" expanded="true" signature="619:727" placeholder="INSERT INTO `projects`... " />
+ <marker date="1522074655857" expanded="true" signature="782:860" placeholder="INSERT INTO `tags`... " />
</folding>
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/studentview/database/userExists.php">
+ <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" />
+ <folding>
+ <marker date="1522074655864" expanded="true" signature="219:314" placeholder="SELECT (u.to... users" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.tags">
+ <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">
+ <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/pages/projects.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="4.967742">
+ <caret line="29" column="42" selection-start-line="29" selection-start-column="42" selection-end-line="29" selection-end-column="42" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/overview.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.5232163">
+ <caret line="21" column="75" selection-start-line="21" selection-start-column="75" selection-end-line="21" selection-end-column="75" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/dbschema/fltrail(1).sql b/dbschema/fltrail.sql
similarity index 100%
rename from dbschema/fltrail(1).sql
rename to dbschema/fltrail.sql
diff --git a/studentview/.idea/.name b/studentview/.idea/.name
new file mode 100644
index 0000000000000000000000000000000000000000..2e0a5549624df4b7fe22a52fd05415bcb1518b26
--- /dev/null
+++ b/studentview/.idea/.name
@@ -0,0 +1 @@
+studentview
\ No newline at end of file
diff --git a/studentview/.idea/misc.xml b/studentview/.idea/misc.xml
index 401d515875b47abd8df662d6ebb076188a7cc963..e5d2fb2cf03441ff41ba08481f33f738964582f0 100644
--- a/studentview/.idea/misc.xml
+++ b/studentview/.idea/misc.xml
@@ -1,4 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" />
+ <component name="MavenImportPreferences">
+ <option name="generalSettings">
+ <MavenGeneralSettings>
+ <option name="mavenHome" value="Bundled (Maven 3)" />
+ </MavenGeneralSettings>
+ </option>
+ </component>
+ <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+ <OptionsSetting value="true" id="Add" />
+ <OptionsSetting value="true" id="Remove" />
+ <OptionsSetting value="true" id="Checkout" />
+ <OptionsSetting value="true" id="Update" />
+ <OptionsSetting value="true" id="Status" />
+ <OptionsSetting value="true" id="Edit" />
+ <ConfirmationsSetting value="0" id="Add" />
+ <ConfirmationsSetting value="0" id="Remove" />
+ </component>
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" default="true" assert-keyword="true" jdk-15="true">
+ <output url="file://$PROJECT_DIR$/out" />
+ </component>
+ <component name="masterDetails">
+ <states>
+ <state key="ProjectJDKs.UI">
+ <settings>
+ <last-edited>1.8</last-edited>
+ <splitter-proportions>
+ <option name="proportions">
+ <list>
+ <option value="0.2" />
+ </list>
+ </option>
+ </splitter-proportions>
+ </settings>
+ </state>
+ </states>
+ </component>
</project>
\ No newline at end of file
diff --git a/studentview/.idea/modules.xml b/studentview/.idea/modules.xml
index 3e737d1b476e14e8314b08dbb396697efd03b71d..08c75b973bd7077fdff1af7145abd8244919b42c 100644
--- a/studentview/.idea/modules.xml
+++ b/studentview/.idea/modules.xml
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/studentview.iml" filepath="$PROJECT_DIR$/.idea/studentview.iml" />
+ <module fileurl="file://$PROJECT_DIR$/studentview.iml" filepath="$PROJECT_DIR$/studentview.iml" />
</modules>
</component>
</project>
\ No newline at end of file
diff --git a/studentview/.idea/workspace.xml b/studentview/.idea/workspace.xml
index 53ce0c3f0c520439653376d134baa3f3474a2498..a33d91e60ae5d8760a9a908c7493d2ee1966f207 100644
--- a/studentview/.idea/workspace.xml
+++ b/studentview/.idea/workspace.xml
@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
- <list default="true" id="126300c7-c07e-4cdd-9738-4cbf01f41fe3" name="Default" comment="" />
- <ignored path=".idea/dataSources.local.xml" />
+ <list default="true" id="3c5c4f85-4011-437d-8046-b77c883995a1" name="Default" comment="" />
+ <ignored path="studentview.iws" />
+ <ignored path=".idea/workspace.xml" />
+ <ignored path="$PROJECT_DIR$/out/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
@@ -10,6 +12,7 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
+ <component name="ChangesViewManager" flattened_view="true" show_ignored="false" />
<component name="CreatePatchCommitExecutor">
<option name="PATCH_PATH" value="" />
</component>
@@ -17,235 +20,35 @@
<component name="FavoritesManager">
<favorites_list name="studentview" />
</component>
- <component name="FileEditorManager">
- <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
- <file leaf-file-name="Projekte.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/assets/js/Projekte.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="546">
- <caret line="26" column="12" lean-forward="false" selection-start-line="26" selection-start-column="12" selection-end-line="26" selection-end-column="12" />
- <folding>
- <marker date="1521538629381" expanded="true" signature="77:153" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="utility.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/assets/js/utility.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="createPreferences.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/assets/js/createPreferences.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="576">
- <caret line="96" column="54" lean-forward="false" selection-start-line="96" selection-start-column="54" selection-end-line="96" selection-end-column="54" />
- <folding>
- <element signature="e#0#46#0" expanded="false" />
- <marker date="1521541035422" expanded="true" signature="1662:1746" ph="..." />
- <marker date="1521541035422" expanded="true" signature="2785:2803" ph="..." />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="preferences.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pages/preferences.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="567">
- <caret line="27" column="51" lean-forward="false" selection-start-line="27" selection-start-column="51" selection-end-line="27" selection-end-column="51" />
- <folding>
- <marker date="1521536293585" expanded="true" signature="182:256" ph="SELECT (`id`... projects" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="newproject.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pages/newproject.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="406">
- <caret line="28" column="11" lean-forward="false" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="11" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="getProjects.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/database/getProjects.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="630">
- <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
- <folding>
- <marker date="1521535205842" expanded="true" signature="398:446" ph="SELECT * FRO... projects" />
- <marker date="1521535205842" expanded="true" signature="766:767" ph="..." />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="styles.css" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/assets/css/styles.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="547">
- <caret line="70" column="14" lean-forward="false" selection-start-line="70" selection-start-column="8" selection-end-line="70" selection-end-column="14" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="newProject.js" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/assets/js/newProject.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="563">
- <caret line="99" column="87" lean-forward="true" selection-start-line="99" selection-start-column="87" selection-end-line="99" selection-end-column="87" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="enrollment.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/pages/enrollment.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="295">
- <caret line="29" column="19" lean-forward="false" selection-start-line="29" selection-start-column="19" selection-end-line="29" selection-end-column="19" />
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="putProject.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/database/putProject.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="819">
- <caret line="38" column="85" lean-forward="false" selection-start-line="38" selection-start-column="18" selection-end-line="38" selection-end-column="85" />
- <folding>
- <marker date="1521534419274" expanded="true" signature="751:946" ph="INSERT INTO `projects`... " />
- <marker date="1521534419274" expanded="true" signature="1001:1079" ph="INSERT INTO `tags`... " />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
- </component>
- <component name="FileTemplateManagerImpl">
- <option name="RECENT_TEMPLATES">
- <list>
- <option value="package_json" />
- <option value="HTML File" />
- <option value="JavaScript File" />
- </list>
- </option>
- </component>
- <component name="FindInProjectRecents">
- <findStrings>
- <find>studen</find>
- <find>over</find>
- <find>pages</find>
- <find>get</find>
- <find>projectT</find>
- <find>die e</find>
- <find>tag</find>
- <find>falsc</find>
- <find>$('projectIsMissing').</find>
- <find>project e</find>
- <find>projectWrongPassword</find>
- <find>seeProject</find>
- <find>email</find>
- <find>erste</find>
- <find>focus</find>
- <find>tags</find>
- <find>getprojec</find>
- <find>display</find>
- <find>autof</find>
- <find>loader</find>
- <find>projectnam</find>
- <find>pref</find>
- <find>prefe</find>
- <find>location</find>
- <find>putProj</find>
- <find>putTag</find>
- <find>putproj</find>
- <find>alert</find>
- <find>opacit</find>
- <find>user</find>
- </findStrings>
- </component>
<component name="GradleLocalSettings">
<option name="externalProjectsViewState">
<projects_view />
</option>
</component>
- <component name="IdeDocumentHistory">
- <option name="CHANGED_PATHS">
- <list>
- <option value="$PROJECT_DIR$/pages/Home.html" />
- <option value="$PROJECT_DIR$/pages/createProject.html" />
- <option value="$PROJECT_DIR$/pages/groupfinder.html" />
- <option value="$PROJECT_DIR$/pages/new project.html" />
- <option value="$PROJECT_DIR$/pages/my groups.html" />
- <option value="$PROJECT_DIR$/assets/js/PutProject.js" />
- <option value="$PROJECT_DIR$/pages/package.json" />
- <option value="$PROJECT_DIR$/assets/js/Eventhandler.js" />
- <option value="$PROJECT_DIR$/assets/js/GETfile.js" />
- <option value="$PROJECT_DIR$/assets/js/testne.js" />
- <option value="$PROJECT_DIR$/assets/js/testne.html" />
- <option value="$PROJECT_DIR$/pages/overview.html" />
- <option value="$PROJECT_DIR$/pages/neuesProjekt.html" />
- <option value="$PROJECT_DIR$/pages/MeineGruppen.html" />
- <option value="$PROJECT_DIR$/index.html" />
- <option value="$PROJECT_DIR$/pages/Projekte.html" />
- <option value="$PROJECT_DIR$/database/config.php" />
- <option value="$PROJECT_DIR$/pages/getTags.php" />
- <option value="$PROJECT_DIR$/database/tokenSetter.php" />
- <option value="$PROJECT_DIR$/pages/getProjects.php" />
- <option value="$PROJECT_DIR$/database/getTags.php" />
- <option value="$PROJECT_DIR$/database/putTags.php" />
- <option value="$PROJECT_DIR$/database/getAdresses.php" />
- <option value="$PROJECT_DIR$/pages/overview.php" />
- <option value="$PROJECT_DIR$/pages/neuesProjekt.php" />
- <option value="$PROJECT_DIR$/database/getProjectExists.php" />
- <option value="$PROJECT_DIR$/register.html" />
- <option value="$PROJECT_DIR$/pages/MeineGruppen.php" />
- <option value="$PROJECT_DIR$/pages/Projekte.php" />
- <option value="$PROJECT_DIR$/pages/menu.php" />
- <option value="$PROJECT_DIR$/assets/js/myGroupsInit.js" />
- <option value="$PROJECT_DIR$/assets/js/overview.js" />
- <option value="$PROJECT_DIR$/pages/mygroups.php" />
- <option value="$PROJECT_DIR$/pages/projects.php" />
- <option value="$PROJECT_DIR$/index.php" />
- <option value="$PROJECT_DIR$/pages/newproject.php" />
- <option value="$PROJECT_DIR$/database/putProject.php" />
- <option value="$PROJECT_DIR$/database/getProjects.php" />
- <option value="$PROJECT_DIR$/pages/enrollment.php" />
- <option value="$PROJECT_DIR$/pages/preferences.php" />
- <option value="$PROJECT_DIR$/assets/css/styles.css" />
- <option value="$PROJECT_DIR$/assets/js/utility.js" />
- <option value="$PROJECT_DIR$/assets/js/Projekte.js" />
- <option value="$PROJECT_DIR$/assets/js/createPreferences.js" />
- <option value="$PROJECT_DIR$/assets/js/newProject.js" />
- </list>
- </option>
- </component>
- <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
- <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
+ <component name="JsBuildToolGruntFileManager" detection-done="true" />
+ <component name="JsBuildToolPackageJson" detection-done="true" />
<component name="JsGulpfileManager">
<detection-done>true</detection-done>
- <sorting>DEFINITION_ORDER</sorting>
+ </component>
+ <component name="PhpServers">
+ <servers />
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
- <option name="x" value="-359" />
- <option name="y" value="-1449" />
- <option name="width" value="2578" />
- <option name="height" value="1458" />
+ <option name="x" value="-914" />
+ <option name="y" value="1431" />
+ <option name="width" value="1938" />
+ <option name="height" value="1098" />
+ </component>
+ <component name="ProjectLevelVcsManager" settingsEditedManually="false">
+ <OptionsSetting value="true" id="Add" />
+ <OptionsSetting value="true" id="Remove" />
+ <OptionsSetting value="true" id="Checkout" />
+ <OptionsSetting value="true" id="Update" />
+ <OptionsSetting value="true" id="Status" />
+ <OptionsSetting value="true" id="Edit" />
+ <ConfirmationsSetting value="0" id="Add" />
+ <ConfirmationsSetting value="0" id="Remove" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
@@ -262,7 +65,9 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
+ <pane id="PackagesPane" />
<pane id="Scratches" />
+ <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -270,52 +75,6 @@
<option name="myItemId" value="studentview" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="pages" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="database" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="assets" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -324,618 +83,172 @@
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="assets" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="js" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- </PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="assets" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="css" />
- <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
- <pane id="Scope" />
- <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
- <property name="WebServerToolWindowFactoryState" value="false" />
- <property name="nodejs_interpreter_path" value="C:/Program Files/nodejs/node" />
- <property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="aspect.path.notification.shown" value="true" />
- <property name="last_opened_file_path" value="$PROJECT_DIR$" />
- <property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
+ <property name="WebServerToolWindowFactoryState" value="true" />
</component>
- <component name="RecentsManager">
- <key name="CopyFile.RECENT_KEYS">
- <recent name="C:\Users\dehne\Documents\GitHub\fltrail\studentview" />
- </key>
- <key name="MoveFile.RECENT_KEYS">
- <recent name="C:\xampp\htdocs\fltrail\studentview\database" />
- </key>
- </component>
- <component name="RunDashboard">
- <option name="ruleStates">
- <list>
- <RuleState>
- <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
- </RuleState>
- <RuleState>
- <option name="name" value="StatusDashboardGroupingRule" />
- </RuleState>
- </list>
- </option>
- </component>
- <component name="RunManager" selected="JavaScript Debug.testpage.html">
- <configuration default="false" name="overview.html" type="JavascriptDebugType" factoryName="JavaScript Debug" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/studentview/pages/overview.html">
+ <component name="RunManager">
+ <configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
+ <module name="" />
+ <option name="VM_PARAMETERS" value="-Xmx512m -Xms256m -XX:MaxPermSize=250m -ea" />
+ <option name="PROGRAM_PARAMETERS" />
<method />
</configuration>
- <configuration default="false" name="testpage.html" type="JavascriptDebugType" factoryName="JavaScript Debug" temporary="true" nameIsGenerated="true" uri="http://localhost:63342/studentview/pages/testpage.html">
+ <configuration default="true" type="Applet" factoryName="Applet">
+ <option name="HTML_USED" value="false" />
+ <option name="WIDTH" value="400" />
+ <option name="HEIGHT" value="300" />
+ <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
+ <module />
<method />
</configuration>
- <configuration default="true" type="CodeceptionConfigurationType" factoryName="Codeception">
- <PhpTestRunnerSettings />
- <method />
- </configuration>
- <configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
- <node-interpreter value="project" />
- <working-dir value="" />
+ <configuration default="true" type="Application" factoryName="Application">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <module name="" />
<envs />
- <scope-kind value="ALL" />
<method />
</configuration>
- <configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">
- <config-file value="" />
- <node-interpreter value="project" />
+ <configuration default="true" type="JUnit" factoryName="JUnit">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
<envs />
+ <patterns />
<method />
</configuration>
- <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
- <method />
- </configuration>
- <configuration default="true" type="NodeJSConfigurationType" factoryName="Node.js" path-to-node="project" working-dir="">
- <method />
- </configuration>
- <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
- <TestRunner />
- <method />
- </configuration>
- <configuration default="true" type="PhpBehatConfigurationType" factoryName="Behat">
- <BehatRunner />
- <method />
- </configuration>
- <configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
<method />
</configuration>
- <configuration default="true" type="PhpSpecConfigurationType" factoryName="PHPSpec">
- <PhpTestRunnerSettings />
- <method />
- </configuration>
- <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
- <node-interpreter>project</node-interpreter>
- <node-options />
- <gulpfile />
- <tasks />
- <arguments />
+ <configuration default="true" type="TestNG" factoryName="TestNG">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="SUITE_NAME" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="GROUP_NAME" />
+ <option name="TEST_OBJECT" value="CLASS" />
+ <option name="VM_PARAMETERS" value="-ea" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
+ <option name="OUTPUT_DIRECTORY" />
+ <option name="ANNOTATION_TYPE" />
+ <option name="ENV_VARIABLES" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="singleModule" />
+ </option>
+ <option name="USE_DEFAULT_REPORTERS" value="false" />
+ <option name="PROPERTIES_FILE" />
<envs />
+ <properties />
+ <listeners />
<method />
</configuration>
- <configuration default="true" type="js.build_tools.npm" factoryName="npm">
- <command value="run" />
- <scripts />
- <node-interpreter value="project" />
- <envs />
- <method />
- </configuration>
- <configuration default="true" type="mocha-javascript-test-runner" factoryName="Mocha">
- <node-interpreter>project</node-interpreter>
- <node-options />
- <working-directory />
- <pass-parent-env>true</pass-parent-env>
- <envs />
- <ui />
- <extra-mocha-options />
- <test-kind>DIRECTORY</test-kind>
- <test-directory />
- <recursive>false</recursive>
- <method />
- </configuration>
- <list size="2">
- <item index="0" class="java.lang.String" itemvalue="JavaScript Debug.overview.html" />
- <item index="1" class="java.lang.String" itemvalue="JavaScript Debug.testpage.html" />
- </list>
- <recent_temporary>
- <list size="2">
- <item index="0" class="java.lang.String" itemvalue="JavaScript Debug.testpage.html" />
- <item index="1" class="java.lang.String" itemvalue="JavaScript Debug.overview.html" />
- </list>
- </recent_temporary>
</component>
<component name="SbtLocalSettings">
<option name="externalProjectsViewState">
<projects_view />
</option>
</component>
- <component name="ShelveChangesManager" show_recycled="false">
- <option name="remove_strategy" value="false" />
- </component>
- <component name="SvnConfiguration">
- <configuration />
- </component>
+ <component name="ShelveChangesManager" show_recycled="false" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
- <changelist id="126300c7-c07e-4cdd-9738-4cbf01f41fe3" name="Default" comment="" />
- <created>1517303146383</created>
+ <changelist id="3c5c4f85-4011-437d-8046-b77c883995a1" name="Default" comment="" />
+ <created>1522142538267</created>
<option name="number" value="Default" />
- <option name="presentableId" value="Default" />
- <updated>1517303146383</updated>
- <workItem from="1517303147568" duration="5873000" />
- <workItem from="1518001309495" duration="13578000" />
- <workItem from="1518173282757" duration="2354000" />
- <workItem from="1518420202447" duration="9472000" />
- <workItem from="1518772323849" duration="1327000" />
- <workItem from="1519043151732" duration="5261000" />
- <workItem from="1519108315288" duration="9452000" />
- <workItem from="1519375817654" duration="97000" />
- <workItem from="1519384118970" duration="1528000" />
- <workItem from="1519640382010" duration="10984000" />
- <workItem from="1519725623889" duration="6008000" />
- <workItem from="1519891911695" duration="7508000" />
- <workItem from="1519980697735" duration="11562000" />
- <workItem from="1520232412925" duration="22197000" />
- <workItem from="1520321988715" duration="7355000" />
- <workItem from="1521190416377" duration="1355000" />
- <workItem from="1521440534915" duration="760000" />
- <workItem from="1521447873243" duration="9916000" />
- <workItem from="1521528114036" duration="11345000" />
+ <updated>1522142538267</updated>
+ <workItem from="1522142543338" duration="40000" />
+ <workItem from="1522142603790" duration="30000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="137960000" />
+ <option name="totallyTimeSpent" value="70000" />
</component>
<component name="ToolWindowManager">
- <frame x="-359" y="-1449" width="2578" height="1458" extended-state="6" />
- <editor active="true" />
+ <frame x="-914" y="1431" width="1938" height="1098" extended-state="6" />
+ <editor active="false" />
<layout>
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19765624" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<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="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32955405" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
- <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="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" show_stripe_button="true" weight="0.32955405" sideWeight="0.5" order="1" 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="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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" 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.41522232" sideWeight="0.37773436" 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="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="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="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="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="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="7" 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="2" 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.4" sideWeight="0.5" order="3" 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="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="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" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3297062" sideWeight="0.5" order="11" side_tool="false" 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="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="Hierarchy" 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="2" side_tool="false" content_ui="combo" />
- <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="JSF" 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="6" 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.42803314" sideWeight="0.5335938" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.36247173" sideWeight="0.57851565" order="7" 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="Java Enterprise" 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="12" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" 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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3564431" sideWeight="0.7210938" order="2" 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.41522232" sideWeight="0.62226564" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
- <component name="TypeScriptGeneratedFilesManager">
- <option name="processedProjectFiles" value="true" />
+ <component name="Vcs.Log.UiProperties">
+ <option name="RECENTLY_FILTERED_USER_GROUPS">
+ <collection />
+ </option>
+ <option name="RECENTLY_FILTERED_BRANCH_GROUPS">
+ <collection />
+ </option>
</component>
<component name="VcsContentAnnotationSettings">
<option name="myLimit" value="2678400000" />
</component>
<component name="XDebuggerManager">
- <breakpoint-manager>
- <option name="time" value="1" />
- </breakpoint-manager>
+ <breakpoint-manager />
<watches-manager />
</component>
- <component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/pages/Projekte.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="55" column="133" lean-forward="false" selection-start-line="55" selection-start-column="133" selection-end-line="55" selection-end-column="133" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/assets/js/myGroupsInit.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="23" column="88" lean-forward="false" selection-start-line="23" selection-start-column="88" selection-end-line="23" selection-end-column="88" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/index.html" />
- <entry file="file://$PROJECT_DIR$/pages/MeineGruppen.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="46" column="14" lean-forward="false" selection-start-line="46" selection-start-column="14" selection-end-line="46" selection-end-column="14" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/neuesProjekt.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="34" column="108" lean-forward="false" selection-start-line="34" selection-start-column="108" selection-end-line="34" selection-end-column="108" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/Projekte.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="49" column="14" lean-forward="false" selection-start-line="49" selection-start-column="14" selection-end-line="49" selection-end-column="14" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/overview.html" />
- <entry file="file://$PROJECT_DIR$/assets/bootstrap/js/bootstrap.min.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="6" column="21" lean-forward="false" selection-start-line="6" selection-start-column="21" selection-end-line="6" selection-end-column="48" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/package.json">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="2" column="30" lean-forward="false" selection-start-line="2" selection-start-column="30" selection-end-line="2" selection-end-column="30" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/assets/js/GETfile.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/overview.html" />
- <entry file="file://$PROJECT_DIR$/index.html" />
- <entry file="file://$PROJECT_DIR$/database/userCorrect.php" />
- <entry file="file://$PROJECT_DIR$/../../PhpstormProjects/spiderweb/serviceout.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="398">
- <caret line="34" column="1" lean-forward="true" selection-start-line="34" selection-start-column="1" selection-end-line="34" selection-end-column="1" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/../../PhpstormProjects/spiderweb/js/serviceout.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="-4956">
- <caret line="31" column="27" lean-forward="true" selection-start-line="31" selection-start-column="27" selection-end-line="31" selection-end-column="27" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/database/createUser.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/database/getAdresses.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="315">
- <caret line="20" column="16" lean-forward="false" selection-start-line="20" selection-start-column="16" selection-end-line="20" selection-end-column="16" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/overview.php" />
- <entry file="file://$PROJECT_DIR$/assets/css/Contact-Form-Clean.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/assets/css/Sidebar-Menu.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/assets/css/Login-Form-Clean.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="1" lean-forward="false" selection-start-line="0" selection-start-column="1" selection-end-line="0" selection-end-column="1" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/assets/css/Navigation-with-Button1.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="4158">
- <caret line="204" column="36" lean-forward="true" selection-start-line="204" selection-start-column="36" selection-end-line="204" selection-end-column="36" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/database/config.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="63">
- <caret line="8" column="5" lean-forward="true" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="6" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/MeineGruppen.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="462">
- <caret line="61" column="60" lean-forward="true" selection-start-line="61" selection-start-column="60" selection-end-line="61" selection-end-column="60" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/database/getProjectExists.php" />
- <entry file="file://$PROJECT_DIR$/pages/neuesProjekt.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="765">
- <caret line="60" column="54" lean-forward="true" selection-start-line="60" selection-start-column="54" selection-end-line="60" selection-end-column="54" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/Projekte.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="441">
- <caret line="60" column="46" lean-forward="false" selection-start-line="60" selection-start-column="46" selection-end-line="60" selection-end-column="46" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/menu.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="63">
- <caret line="8" column="2" lean-forward="false" selection-start-line="8" selection-start-column="2" selection-end-line="8" selection-end-column="2" />
- <folding>
- <element signature="e#6#91#0#PHP" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/assets/js/Sidebar-Menu.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/register.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding>
- <marker date="1521460058117" expanded="true" signature="1758:1827" ph="..." />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/register.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="336">
- <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/database/userExists.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="399">
- <caret line="24" column="22" lean-forward="false" selection-start-line="24" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
- <folding>
- <marker date="1521124628705" expanded="true" signature="219:314" ph="SELECT (u.to... users" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/assets/js/myGroupsInit.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="639">
- <caret line="63" column="63" lean-forward="false" selection-start-line="63" selection-start-column="63" selection-end-line="63" selection-end-column="63" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/assets/js/overview.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="935">
- <caret line="141" column="88" lean-forward="false" selection-start-line="141" selection-start-column="88" selection-end-line="141" selection-end-column="88" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/mygroups.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="357">
- <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/projects.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="441">
- <caret line="21" column="0" lean-forward="false" selection-start-line="21" selection-start-column="0" selection-end-line="21" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/index.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="273">
- <caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
- <folding>
- <marker date="1521463886931" expanded="true" signature="1329:1388" ph="..." />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/database/getTags.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="504">
- <caret line="29" column="2" lean-forward="false" selection-start-line="29" selection-start-column="2" selection-end-line="29" selection-end-column="2" />
- <folding>
- <element signature="e#6#91#0#PHP" expanded="false" />
- <marker date="1521124628701" expanded="true" signature="336:391" ph="SELECT * FRO... tags" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/getProjects.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="0">
- <caret line="0" column="0" lean-forward="false" 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$/database/putTagsAndPW.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="273">
- <caret line="18" column="28" lean-forward="false" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
- <folding>
- <element signature="e#6#92#0#PHP" expanded="false" />
- <marker date="1521460058096" expanded="true" signature="619:727" ph="INSERT INTO `projects`... " />
- <marker date="1521460058096" expanded="true" signature="782:860" ph="INSERT INTO `tags`... " />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/database/tokenSetter.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="252">
- <caret line="12" column="18" lean-forward="false" selection-start-line="12" selection-start-column="18" selection-end-line="12" selection-end-column="18" />
- <folding>
- <marker date="1521124628703" expanded="true" signature="152:218" ph="SELECT (`nam... users" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/database/getProjects.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="630">
- <caret line="30" column="0" lean-forward="false" selection-start-line="30" selection-start-column="0" selection-end-line="30" selection-end-column="0" />
- <folding>
- <marker date="1521535205842" expanded="true" signature="398:446" ph="SELECT * FRO... projects" />
- <marker date="1521535205842" expanded="true" signature="766:767" ph="..." />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/enrollment.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="295">
- <caret line="29" column="19" lean-forward="false" selection-start-line="29" selection-start-column="19" selection-end-line="29" selection-end-column="19" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/database/putProject.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="819">
- <caret line="38" column="85" lean-forward="false" selection-start-line="38" selection-start-column="18" selection-end-line="38" selection-end-column="85" />
- <folding>
- <marker date="1521534419274" expanded="true" signature="751:946" ph="INSERT INTO `projects`... " />
- <marker date="1521534419274" expanded="true" signature="1001:1079" ph="INSERT INTO `tags`... " />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/preferences.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="567">
- <caret line="27" column="51" lean-forward="false" selection-start-line="27" selection-start-column="51" selection-end-line="27" selection-end-column="51" />
- <folding>
- <marker date="1521536293585" expanded="true" signature="182:256" ph="SELECT (`id`... projects" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/assets/js/utility.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="210">
- <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/assets/js/Projekte.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="546">
- <caret line="26" column="12" lean-forward="false" selection-start-line="26" selection-start-column="12" selection-end-line="26" selection-end-column="12" />
- <folding>
- <marker date="1521538629381" expanded="true" signature="77:153" ph="{...}" />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/assets/css/styles.css">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="547">
- <caret line="70" column="14" lean-forward="false" selection-start-line="70" selection-start-column="8" selection-end-line="70" selection-end-column="14" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/assets/js/createPreferences.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="576">
- <caret line="96" column="54" lean-forward="false" selection-start-line="96" selection-start-column="54" selection-end-line="96" selection-end-column="54" />
- <folding>
- <element signature="e#0#46#0" expanded="false" />
- <marker date="1521541035422" expanded="true" signature="1662:1746" ph="..." />
- <marker date="1521541035422" expanded="true" signature="2785:2803" ph="..." />
- </folding>
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/pages/newproject.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="406">
- <caret line="28" column="11" lean-forward="false" selection-start-line="28" selection-start-column="7" selection-end-line="28" selection-end-column="11" />
- <folding />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/assets/js/newProject.js">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="563">
- <caret line="99" column="87" lean-forward="true" selection-start-line="99" selection-start-column="87" selection-end-line="99" selection-end-column="87" />
- <folding />
- </state>
- </provider>
- </entry>
- </component>
</project>
\ No newline at end of file
diff --git a/studentview/assets/js/GETfile.js b/studentview/assets/js/GETfile.js
deleted file mode 100644
index 446f6426bb65c14a7055808220b50832ed6547a3..0000000000000000000000000000000000000000
--- a/studentview/assets/js/GETfile.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Created by fides-WHK on 09.01.2018.
- */
-
-function loadData() {
- var competencies = $("#competencies").val();
- var researchQuestion = $("#researchQuestion").val();
- var tags = $("#Tags").val();
- /* since jquery works async, you won't see an alert but it works going through the steps one by one
- $.getJSON("../assets/dummyGroups.json", function(data){
-
- alert("juhu");
- alert(data.student2.name);
- window.location.href="my groups.html";
- });
- */
- var url="https://esb.uni-potsdam.de:8243/services/competenceBase/api2/groups/12345";
- $.ajax({
- url: url,
- type: 'GET',
- contentType: "application/json",
- dataType:"json",
- beforeSend: function(){
- },
- success: function (data) {
- alert(data.groups[0].users[0]+" und "+data.groups[0].users[1]+" und auch "+data.groups[0].users[2]);
- }
- });
-}
diff --git a/studentview/assets/js/newProject.js b/studentview/assets/js/newProject.js
index b938a85940ee44ba1a32701ab3474a1b90a47ae4..002173be7d09ba5befd0c55163c25e0186c81064 100644
--- a/studentview/assets/js/newProject.js
+++ b/studentview/assets/js/newProject.js
@@ -6,6 +6,7 @@ $(document).ready(function () {
$("#nameProject").focus();
$('#projectNameExists').hide();
$('#projectIsMissing').hide();
+ $('#exactNumberOfTags').hide();
$(function () {
$('#tagsProject').tagsInput({
width: '475px',
@@ -25,8 +26,8 @@ $(document).ready(function () {
function createNewProject(allTheTags, activ) {
- var projectName = $("#nameProject").val();
- var password = $("#passwordProject").val();
+ var projectName = $("#nameProject").val().trim();
+ var password = $("#passwordProject").val().trim();
document.getElementById('loader').className = "loader";
document.getElementById('wrapper').className = "wrapper-inactive";
var localurl = "../database/getProjects.php?project=" + projectName;
@@ -58,6 +59,7 @@ function createNewProject(allTheTags, activ) {
document.getElementById('tagHelper').className = "alert alert-warning";
document.getElementById('loader').className = "loader-inactive";
document.getElementById('wrapper').className = "wrapper";
+ $('#exactNumberOfTags').show();
return false;
}
document.getElementById('tagHelper').className = "";
@@ -75,7 +77,7 @@ function createNewProject(allTheTags, activ) {
type: 'PUT',
data: dataString,
success: function (response) {
- alert(response);
+ console.log(response);
document.getElementById('loader').className = "loader-inactive";
document.getElementById('wrapper').className = "wrapper";
},
diff --git a/studentview/assets/js/overview.js b/studentview/assets/js/overview.js
index 78b2d3386bb6bdb30643c3699a03eda96377f5f7..9eae782daed220c91a0414609c23b0ce1bb685e4 100644
--- a/studentview/assets/js/overview.js
+++ b/studentview/assets/js/overview.js
@@ -1,13 +1,38 @@
/**
* Created by fides-WHK on 02.03.2018.
*/
+
$(document).ready(function () {
getProjectOverview(document.getElementById('user').innerHTML);
//getMembers($('#projectDropdown').innerHTML,$('#user').innerHTML);
});
+function printProjects(projects, offset) {
+ var table = document.getElementById("projectTable");
+ var i = 0;
+ for (i = 0; i < projects.length; i++) {
+ var project = projects[i];
+ var content = document.createElement("TR");
+ content.role = "button";
+ content.style = "cursor:pointer;";
+ content.id = project;
+ content.innerHTML = '<td align="center">' +
+ '<a class="btn btn-default"><em class="fa fa-pencil"></em></a>' +
+ '<a class="btn btn-danger"><em class="fa fa-trash"></em></a>' +
+ '</td>' +
+ '<td class="hidden-xs" href="#Div_Promo_Carousel" data-slide="next">' + projects[i] + '</td>' +
+ '<td id="projectTags' + (i + offset) + '" href="#Div_Promo_Carousel" data-slide="next"></td>';
+ table.appendChild(content);
+ getTags(project, i + offset);
+ $('#' + project).click(function () {
+ getGroups(this.id);
+ });
+ }
+}
function getProjectOverview(user) {
+
+
var url = "https://esb.uni-potsdam.de:8243/services/competenceBase/api2/user/" + user + "/projects";
$.ajax({
url: url,
@@ -16,25 +41,9 @@ function getProjectOverview(user) {
contentType: "application/json",
dataType: "json",
success: function (data) {
- var table = document.getElementById("projectTable");
- var i = 0;
- for (i = 0; i < data.data.length; i++) {
- var content = document.createElement("TR");
- content.role = "button";
- content.style = "cursor:pointer;";
- content.id = data.data[i];
- content.innerHTML = '<td align="center">' +
- '<a class="btn btn-default"><em class="fa fa-pencil"></em></a>' +
- '<a class="btn btn-danger"><em class="fa fa-trash"></em></a>' +
- '</td>' +
- '<td class="hidden-xs" href="#Div_Promo_Carousel" data-slide="next">' + data.data[i] + '</td>' +
- '<td id="projectTags' + i + '" href="#Div_Promo_Carousel" data-slide="next"></td>';
- table.appendChild(content);
- getTags(data.data[i], i);
- $('#' + data.data[i]).click(function () {
- getGroups(this.id);
- });
- }
+ var projects = data.data;
+ printProjects(projects, 0);
+ getProjectsOfAuthor(user, projects);
},
error: function (a, b, c) {
console.log(a);
@@ -64,6 +73,28 @@ function getTags(projectName, number) {
});
}
+
+function getProjectsOfAuthor(author, printedProjects) {
+ var url = "../database/getProjectsOfAuthor.php?author=" + author;
+ $.ajax({
+ url: url,
+ Accept: "text/plain; charset=utf-8",
+ contentType: "text/plain",
+ success: function (response) {
+ var authoredProjects = JSON.parse(response);
+ for (var i = 0; i < printedProjects.length; i++) {
+ authoredProjects = authoredProjects.filter(function(el) {
+ return el !== printedProjects[i];
+ });
+ }
+ printProjects(authoredProjects, printedProjects.length);
+ },
+ error: function (a, b, c) {
+ console.log(a);
+ }
+ });
+}
+
function getGroups(projectName) {
var pathName = document.getElementsByName("pathProject");
pathName[0].innerHTML = projectName;
diff --git a/studentview/assets/js/Projekte.js b/studentview/assets/js/showProjects.js
similarity index 100%
rename from studentview/assets/js/Projekte.js
rename to studentview/assets/js/showProjects.js
diff --git a/studentview/database/config.php b/studentview/database/config.php
index d9762e6801968146d53bec46231b0dcd8f1be2af..30162847f52adae5303d0a3aed38719b7d1c0315 100644
--- a/studentview/database/config.php
+++ b/studentview/database/config.php
@@ -6,4 +6,4 @@
* Time: 12:38
*/
-$db = mysqli_connect("localhost", "root", "", "fltrail");
+$db = mysqli_connect("localhost", "root2", "voyager2", "fltrail");
diff --git a/studentview/database/getProjects.php b/studentview/database/getProjects.php
index c4357fc99ecd21abe09401dba7c30fa11dfd926e..25888350c91709c14dab824f43173b3e88371bc3 100644
--- a/studentview/database/getProjects.php
+++ b/studentview/database/getProjects.php
@@ -23,7 +23,7 @@ if(isset($_GET['password'])){
$result = mysqli_query($db,$sql);
$row = mysqli_fetch_array($result);
- if (count($row) < 1){
+ if (!$row || count($row) == 0){
echo 'project missing';
}else {
if ($row['password'] === $password) {
diff --git a/studentview/database/getProjectsOfAuthor.php b/studentview/database/getProjectsOfAuthor.php
new file mode 100644
index 0000000000000000000000000000000000000000..432a4080e9c70db3130f86525ac288fff5853941
--- /dev/null
+++ b/studentview/database/getProjectsOfAuthor.php
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Created by IntelliJ IDEA.
+ * User: dehne
+ * Date: 27.03.2018
+ * Time: 13:43
+ */
+
+/**
+ * Created by PhpStorm.
+ * User: fides-WHK
+ * Date: 26.02.2018
+ * Time: 10:09
+ */
+include_once 'config.php';
+
+if (isset($_GET['author'])) {
+
+ $author = $_GET['author'];
+ $projects = array();
+
+ if (!$db) {
+ die('Could not connect: ' . mysqli_error($db));
+ }
+
+ mysqli_select_db($db, "fltrail");
+ $sql = "SELECT a.id FROM projects a WHERE a.author = '" . $author . "'";
+
+
+ function takeId($array) {
+ return $array->id;
+ }
+
+ if ($result = mysqli_query($db, $sql)) {
+ while ($row = mysqli_fetch_object($result)) {
+ $projects[] = $row;
+ }
+ }
+ $projects = array_map("takeId",$projects);
+ echo json_encode($projects);
+ mysqli_close($db);
+}
\ No newline at end of file
diff --git a/studentview/index.php b/studentview/index.php
index ba759eff52eeb8030a89d07efbe2475c47893ce2..eb7300b0396609d7d6d9d98ac01943467414a031 100644
--- a/studentview/index.php
+++ b/studentview/index.php
@@ -31,7 +31,7 @@
}
?>
</div>
- <a href="register.html" class="forgot">registrieren</a></form>
+ <a href="register.php" class="forgot">registrieren</a></form>
</div>
diff --git a/studentview/pages/enrollment.php b/studentview/pages/enrollment.php
index bb92845bfe0c9735b09e52e863f6273d43f20c11..465daafbc1536d38a26927744eac6d9edcdc0825 100644
--- a/studentview/pages/enrollment.php
+++ b/studentview/pages/enrollment.php
@@ -18,7 +18,7 @@ include_once '../database/tokenSetter.php';
<link rel="stylesheet" href="../assets/css/styles.css">
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script src="../assets/js/utility.js"></script>
- <script src="../assets/js/Projekte.js"></script>
+ <script src="../assets/js/showProjects.js"></script>
<script src="../assets/js/GETfile.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>
<script src="../assets/js/Sidebar-Menu.js"></script>
diff --git a/studentview/pages/newproject.php b/studentview/pages/newproject.php
index 2899bfcc89bf996e9d0a28db77b9bbe2867765e6..3fe083132d0bec8d693b8cfa5439f634807a8b8f 100644
--- a/studentview/pages/newproject.php
+++ b/studentview/pages/newproject.php
@@ -53,10 +53,13 @@ include_once '../database/tokenSetter.php';
</div>
<div class="contact-clean">
<p>Name des Projekts</p>
- <div class="alert alert-warning" role="alert" id="projectNameExists">
+ <div class="alert alert-danger" role="alert" id="projectNameExists">
Dieser Projektname exisitiert bereits.
</div>
- <div class="alert alert-warning" role="alert" id="projectIsMissing">
+ <div class="alert alert-danger" role="alert" id="exactNumberOfTags">
+ Es müssen genau 5 Tags eingegeben werden.
+ </div>
+ <div class="alert alert-danger" role="alert" id="projectIsMissing">
Tragen sie einen Projektnamen ein.
</div>
<div class="form-group"><input class="form-control" type="text" name="name" placeholder="Name"
diff --git a/studentview/pages/projects.php b/studentview/pages/projects.php
index 166b00bb5b291b80df8e187accf638f062d2ef9a..a5db19ef77dd9949243d5962eef04e7786b0cf85 100644
--- a/studentview/pages/projects.php
+++ b/studentview/pages/projects.php
@@ -27,6 +27,7 @@ include_once '../database/tokenSetter.php';
<script src="../assets/js/Customizable-Carousel-swipe-enabled.js"></script>
<script src="../assets/js/Sidebar-Menu.js"></script>
<script src="../assets/js/overview.js"></script>
+ <script src="../assets/js/showProjects.js"></script>
</head>
<body>
@@ -86,8 +87,8 @@ include_once '../database/tokenSetter.php';
</div>
<div class="col col-xs-6 text-right">
<button type="button" class="btn btn-sm btn-primary btn-create"
- onclick="location.href='neuesProjekt.php?token=<?php echo $token ?>'">
- erstelle neuese Projekt
+ onclick="location.href='newproject.php?token=<?php echo $token ?>'">
+ neues Projekt erstellen
</button>
</div>
</div>
diff --git a/studentview/.idea/studentview.iml b/studentview/studentview.iml
similarity index 90%
rename from studentview/.idea/studentview.iml
rename to studentview/studentview.iml
index e28549da18506eb13e5c4cf5ebf1bc7fde7665b0..8021953ed9f8cc6cd6d71c79462bad4cd2b5394c 100644
--- a/studentview/.idea/studentview.iml
+++ b/studentview/studentview.iml
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
diff --git a/studentview/test.php b/studentview/test.php
new file mode 100644
index 0000000000000000000000000000000000000000..e6475e35ffe8fd590303173e69d8043ca803dbbb
--- /dev/null
+++ b/studentview/test.php
@@ -0,0 +1,13 @@
+<?php
+/**
+ * Created by IntelliJ IDEA.
+ * User: dehne
+ * Date: 27.03.2018
+ * Time: 10:22
+ */
+
+echo "hello1";
+
+$stuff = "world";
+
+var_dump($stuff);
\ No newline at end of file