diff --git a/.gitignore b/.gitignore
index e846d2b4a3f16d43f883c50e3423a88e6b6d55ae..4135879260d59abbccc4ff157136add167f8e0b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@
/fltrail.iml
/.idea/workspace.xml
/.idea/workspace.xml
+/.idea/workspace.xml
+/studentview/.idea/workspace.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6219f9602c9f89765cf7993a8d69800b2d614a04..6436660db3626bb15780b760db213138caed94f7 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -32,6 +32,10 @@
<option name="myItemId" value="MySQL - fltrail@localhost" />
<option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="users" />
+ <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -67,43 +71,57 @@
<favorites_list name="fltrail" />
</component>
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="projects.php" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/studentview/pages/projects.php">
- <provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-2.1618497">
- <caret line="29" column="42" selection-start-line="29" selection-start-column="42" selection-end-line="29" selection-end-column="42" />
+ <leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
+ <file leaf-file-name="fltrail.projects" pinned="false" current-in-tab="false">
+ <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.projects">
+ <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="overview.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/overview.js">
+ <file leaf-file-name="styles.css" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="20" column="36" selection-start-line="20" selection-start-column="36" selection-end-line="20" selection-end-column="36" />
+ <state vertical-scroll-proportion="-224.25807">
+ <caret line="349" column="57" selection-start-line="349" selection-start-column="57" selection-end-line="349" selection-end-column="57" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="newproject.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/pages/newproject.php">
+ <file leaf-file-name="preferences.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/pages/preferences.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-15.419354">
- <caret line="72" column="47" selection-start-line="72" selection-start-column="47" selection-end-line="72" selection-end-column="47" />
- <folding />
+ <state vertical-scroll-proportion="-17.903225">
+ <caret line="28" column="71" selection-start-line="28" selection-start-column="71" selection-end-line="28" selection-end-column="71" />
+ <folding>
+ <marker date="1523263995275" expanded="true" signature="182:256" placeholder="SELECT (`id`... projects" />
+ </folding>
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="newProject.js" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/newProject.js">
+ <file leaf-file-name="createPreferences.js" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/createPreferences.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="157" column="35" selection-start-line="157" selection-start-column="35" selection-end-line="157" selection-end-column="35" />
- <folding />
+ <state vertical-scroll-proportion="0.5120385">
+ <caret line="111" column="54" selection-start-line="111" selection-start-column="54" selection-end-line="111" selection-end-column="54" />
+ <folding>
+ <marker date="1523268729248" expanded="true" signature="1662:1746" placeholder="..." />
+ <marker date="1523268729248" expanded="true" signature="2816:3052" placeholder="..." />
+ <marker date="1523268729248" expanded="true" signature="2817:3021" placeholder="..." />
+ <marker date="1523268729248" expanded="true" signature="2817:3052" placeholder="..." />
+ <marker date="1523268729248" expanded="true" signature="2844:2936" placeholder="..." />
+ <marker date="1523268729248" expanded="true" signature="2995:3021" placeholder="..." />
+ </folding>
</state>
</provider>
</entry>
@@ -111,8 +129,8 @@
<file leaf-file-name="putProject.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/studentview/database/putProject.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-23.64516">
- <caret line="40" column="2" selection-start-line="40" selection-start-column="2" selection-end-line="40" selection-end-column="2" />
+ <state vertical-scroll-proportion="-13.225806">
+ <caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
<folding>
<marker date="1522074655855" expanded="true" signature="751:946" placeholder="INSERT INTO `projects`... " />
<marker date="1522074655855" expanded="true" signature="1001:1079" placeholder="INSERT INTO `tags`... " />
@@ -121,75 +139,77 @@
</provider>
</entry>
</file>
- <file leaf-file-name="deleteProject.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/studentview/database/deleteProject.php">
+ <file leaf-file-name="mygroups.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/pages/mygroups.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" />
+ <state vertical-scroll-proportion="-37.774193">
+ <caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="myGroupsInit.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/myGroupsInit.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="95" column="19" selection-start-line="95" selection-start-column="19" selection-end-line="95" selection-end-column="19" />
<folding>
- <marker date="1522074655850" expanded="true" signature="317:369" placeholder="DELETE FROM " />
+ <marker date="1523263140884" expanded="true" signature="2619:2668" placeholder="..." />
</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" />
+ <file leaf-file-name="getProjects.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/studentview/database/getProjects.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-14.903226">
+ <caret line="21" column="4" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="60" />
+ <folding>
+ <marker date="1522147707095" expanded="true" signature="398:446" placeholder="SELECT * FRO... projects" />
+ </folding>
</state>
</provider>
- <provider editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
+ </entry>
+ </file>
+ <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="-0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
+ <folding>
+ <marker date="1522074655851" expanded="true" signature="588:731" placeholder="SELECT name,... users" />
+ </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">
+ <file leaf-file-name="fltrail.users" pinned="false" current-in-tab="false">
+ <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.users">
<provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
<state>
<filtering enabled="true" />
</state>
</provider>
<provider editor-type-id="text-editor">
- <state vertical-scroll-proportion="-0.0">
+ <state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="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="-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="1522152079040" expanded="true" signature="425:487" placeholder="SELECT * FRO... projects" />
- </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">
- <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>
- </file>
</leaf>
</component>
+ <component name="FileTemplateManagerImpl">
+ <option name="RECENT_TEMPLATES">
+ <list>
+ <option value="CSS File" />
+ <option value="JavaScript File" />
+ </list>
+ </option>
+ </component>
<component name="GradleLocalSettings">
<option name="externalProjectsViewState">
<projects_view />
@@ -201,12 +221,29 @@
<option value="$PROJECT_DIR$/../../php/php.ini" />
<option value="$PROJECT_DIR$/studentview/database/config.php" />
<option value="$PROJECT_DIR$/studentview/database/getProjects.php" />
- <option value="dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.projects" />
- <option value="$PROJECT_DIR$/studentview/pages/projects.php" />
<option value="$PROJECT_DIR$/studentview/database/getProjectsOfAuthor.php" />
- <option value="$PROJECT_DIR$/studentview/assets/js/overview.js" />
<option value="$PROJECT_DIR$/studentview/pages/newproject.php" />
<option value="$PROJECT_DIR$/studentview/assets/js/newProject.js" />
+ <option value="$PROJECT_DIR$/studentview/assets/css/projects.css" />
+ <option value="$PROJECT_DIR$/studentview/pages/enrollment.php" />
+ <option value="$PROJECT_DIR$/studentview/pages/deleteProject.php" />
+ <option value="$APPLICATION_CONFIG_DIR$/consoles/db/14340c2c-ac4b-492f-ac4f-18c0853598a8/console_1.sql" />
+ <option value="$PROJECT_DIR$/studentview/database/deleteProject.php" />
+ <option value="$PROJECT_DIR$/studentview/assets/js/getProjects.js" />
+ <option value="$PROJECT_DIR$/studentview/register.php" />
+ <option value="$PROJECT_DIR$/studentview/database/createUser.php" />
+ <option value="$PROJECT_DIR$/studentview/assets/css/Sidebar-Menu1.css" />
+ <option value="$PROJECT_DIR$/studentview/database/tokenSetter.php" />
+ <option value="$PROJECT_DIR$/studentview/pages/menu.php" />
+ <option value="dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.projects" />
+ <option value="$PROJECT_DIR$/studentview/assets/js/deleteProject.js" />
+ <option value="$PROJECT_DIR$/studentview/pages/projects.php" />
+ <option value="$PROJECT_DIR$/studentview/assets/js/overview.js" />
+ <option value="$PROJECT_DIR$/studentview/pages/mygroups.php" />
+ <option value="$PROJECT_DIR$/studentview/assets/js/myGroupsInit.js" />
+ <option value="$PROJECT_DIR$/studentview/pages/preferences.php" />
+ <option value="$PROJECT_DIR$/studentview/assets/css/styles.css" />
+ <option value="$PROJECT_DIR$/studentview/assets/js/createPreferences.js" />
</list>
</option>
</component>
@@ -224,6 +261,11 @@
</path_mappings>
</server>
<server host="localhost" id="75f2248a-2fea-4485-9fd7-0dc130516437" name="localhost" />
+ <server host="141.89.159.250" id="a7129b24-16e0-4988-abb2-c07e26d5f743" name="141.89.159.250" port="443" use_path_mappings="true">
+ <path_mappings>
+ <mapping local-root="$PROJECT_DIR$/studentview" remote-root="C:/dev/amp/htdocs" />
+ </path_mappings>
+ </server>
</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/" />
@@ -259,8 +301,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="Scratches" />
- <pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -379,13 +419,45 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="dbschema" />
+ <option name="myItemId" value="studentview" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="assets" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="fonts" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="fltrail" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="fltrail" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="studentview" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="assets" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="css" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
+ <pane id="Scope" />
<pane id="PackagesPane" />
+ <pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -395,8 +467,14 @@
<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" />
+ <property name="list.type.of.created.stylesheet" value="CSS" />
+ </component>
+ <component name="RecentsManager">
+ <key name="CopyFile.RECENT_KEYS">
+ <recent name="C:\dev\amp\htdocs\fltrail\studentview\pages" />
+ </key>
</component>
- <component name="RunManager" selected="PHP Web Application.test">
+ <component name="RunManager" selected="PHP Web Application.phpserver">
<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" />
@@ -840,6 +918,11 @@
<method />
</configuration>
<configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js">
+ <node-options />
+ <gulpfile />
+ <tasks />
+ <arguments />
+ <envs />
<method />
</configuration>
<configuration default="true" type="js.build_tools.npm" factoryName="npm">
@@ -892,12 +975,13 @@
<created>1522142632208</created>
<option name="number" value="Default" />
<updated>1522142632208</updated>
- <workItem from="1522142635858" duration="15506000" />
+ <workItem from="1522142635858" duration="32910000" />
+ <workItem from="1522918322507" duration="18966000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="15506000" />
+ <option name="totallyTimeSpent" value="51876000" />
</component>
<component name="ToolWindowManager">
<frame x="-9" y="-9" width="2578" height="1410" extended-state="6" />
@@ -905,7 +989,7 @@
<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="true" show_stripe_button="true" weight="0.2736513" sideWeight="0.3796875" 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="false" show_stripe_button="true" weight="0.23455825" sideWeight="0.47734374" order="8" side_tool="true" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.3557394" sideWeight="0.71510416" order="2" side_tool="false" content_ui="tabs" />
@@ -913,13 +997,12 @@
<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.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.2736513" sideWeight="0.6203125" 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.24335937" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+ <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15742187" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="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.32290852" sideWeight="0.5296875" 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.23455825" sideWeight="0.52265626" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
@@ -929,10 +1012,20 @@
<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="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="Database Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32994527" sideWeight="0.4984375" order="14" side_tool="false" content_ui="tabs" />
<window_info id="Bean Validation" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.2736513" sideWeight="0.6203125" order="1" side_tool="false" content_ui="tabs" />
</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>
@@ -945,7 +1038,7 @@
<option name="timeStamp" value="4" />
</line-breakpoint>
</breakpoints>
- <option name="time" value="6" />
+ <option name="time" value="18" />
</breakpoint-manager>
<watches-manager />
</component>
@@ -954,19 +1047,10 @@
<option name="FILTER_TARGETS" value="false" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/../../php/php.ini">
- <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/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>
@@ -974,7 +1058,6 @@
<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>
@@ -982,17 +1065,6 @@
<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>
- <marker date="1520264232000" expanded="true" signature="4453:4480" placeholder="..." />
- </folding>
</state>
</provider>
</entry>
@@ -1000,7 +1072,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
</state>
</provider>
</entry>
@@ -1008,7 +1079,6 @@
<provider selected="true" editor-type-id="text-editor">
<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>
@@ -1016,7 +1086,6 @@
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.2983051">
<caret line="8" column="47" selection-start-line="8" selection-start-column="47" selection-end-line="8" selection-end-column="47" />
- <folding />
</state>
</provider>
</entry>
@@ -1024,10 +1093,6 @@
<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>
- <marker date="1520264232000" expanded="true" signature="31125:31142" placeholder="..." />
- <marker date="1520264232000" expanded="true" signature="31274:31291" placeholder="..." />
- </folding>
</state>
</provider>
</entry>
@@ -1035,7 +1100,6 @@
<provider selected="true" editor-type-id="text-editor">
<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>
@@ -1043,7 +1107,6 @@
<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>
@@ -1051,7 +1114,6 @@
<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>
@@ -1071,137 +1133,277 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/Sidebar-Menu.js">
+ <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="false" />
+ </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="-8.32258">
+ <caret line="16" column="29" selection-start-line="15" selection-start-column="0" selection-end-line="16" selection-end-column="29" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/pages/newproject.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.5723192">
+ <caret line="72" column="47" selection-start-line="72" selection-start-column="47" selection-end-line="72" selection-end-column="47" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/database/putTagsAndPW.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-0.097256854">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/database/getTags.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.68578553">
+ <caret line="25" column="5" selection-start-line="25" selection-start-column="5" selection-end-line="25" selection-end-column="5" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/pages/enrollment.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.9837905">
+ <caret line="44" column="18" selection-start-line="44" selection-start-column="18" selection-end-line="44" selection-end-column="18" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/assets/css/projects.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-17.741936">
+ <caret line="25" column="0" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/jquery.min.js">
+ <entry file="file://$PROJECT_DIR$/../../phpMyAdmin/index.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-8.5161295">
+ <caret line="19" column="0" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/newProject.js">
<provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.44537815">
+ <caret line="92" column="27" selection-start-line="92" selection-start-column="27" selection-end-line="92" selection-end-column="96" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$APPLICATION_CONFIG_DIR$/consoles/db/14340c2c-ac4b-492f-ac4f-18c0853598a8/console_1.sql">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="0" column="15" selection-start-line="0" selection-start-column="15" selection-end-line="0" selection-end-column="15" />
+ </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" />
+ </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" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/index.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-18.451612">
+ <caret line="26" column="45" selection-start-line="26" selection-start-column="45" selection-end-line="26" selection-end-column="45" />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/showProjects.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="31" column="38" selection-start-line="31" selection-start-column="38" selection-end-line="31" selection-end-column="38" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/register.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/register.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-2.419355">
+ <caret line="18" column="34" selection-start-line="18" selection-start-column="34" selection-end-line="18" selection-end-column="34" />
<folding>
- <element signature="n#!!doc" expanded="false" />
+ <marker date="1523003628451" expanded="true" signature="1734:1829" placeholder="..." />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/showProjects.js">
+ <entry file="file://$PROJECT_DIR$/studentview/database/createUser.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-17.032259">
+ <caret line="29" column="10" selection-start-line="29" selection-start-column="10" selection-end-line="29" selection-end-column="10" />
+ <folding>
+ <marker date="1523003632095" expanded="true" signature="346:402" placeholder="SELECT (u.to... users" />
+ <marker date="1523003632095" expanded="true" signature="346:406" placeholder="SELECT (u.to... users" />
+ <marker date="1523003632095" expanded="true" signature="346:409" placeholder="SELECT (u.to... users" />
+ <marker date="1523003632095" expanded="true" signature="346:413" placeholder="SELECT (u.to... users" />
+ <marker date="1523003632095" expanded="true" signature="346:414" placeholder="SELECT (u.to... users" />
+ <marker date="1523003632095" expanded="true" signature="346:426" placeholder="SELECT (u.to... users" />
+ <marker date="1523003632095" expanded="true" signature="346:427" placeholder="SELECT (u.to... users" />
+ <marker date="1523003632095" expanded="true" signature="655:800" placeholder="INSERT INTO `users`... " />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/getProjects.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" />
+ <caret line="4" column="9" selection-start-line="4" selection-start-column="9" selection-end-line="4" selection-end-column="9" />
+ <folding>
+ <element signature="n#!!doc;n#getProjectsOfAuthor#0" expanded="false" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/assets/css/Sidebar-Menu1.css">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-5.352941">
+ <caret line="49" column="13" selection-start-line="49" selection-start-column="13" selection-end-line="49" selection-end-column="13" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/myGroupsInit.js">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/Sidebar-Menu.js">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="18" column="63" selection-start-line="18" selection-start-column="48" selection-end-line="18" selection-end-column="63" />
+ <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/config.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.07746479">
+ <state vertical-scroll-proportion="0.07181719">
<caret line="8" column="40" selection-start-line="8" selection-start-column="40" selection-end-line="8" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/getAdresses.php">
+ <entry file="file://$PROJECT_DIR$/studentview/database/tokenSetter.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" />
+ <state vertical-scroll-proportion="-12.064516">
+ <caret line="17" column="2" selection-start-line="17" selection-start-column="2" selection-end-line="17" selection-end-column="2" />
<folding>
- <marker date="1522074655851" expanded="true" signature="588:731" placeholder="SELECT name,... users" />
+ <marker date="1523005013425" expanded="true" signature="152:218" placeholder="SELECT (`nam... users" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/getTags.php">
+ <entry file="file://$PROJECT_DIR$/studentview/pages/menu.php">
<provider selected="true" editor-type-id="text-editor">
- <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" />
+ <state vertical-scroll-proportion="-10.645162">
+ <caret line="20" column="6" selection-start-line="20" selection-start-column="6" selection-end-line="20" selection-end-column="6" />
<folding>
- <marker date="1522074655854" expanded="true" signature="336:391" placeholder="SELECT * FRO... tags" />
+ <element signature="n#style#0;n#div#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#ul#0;n#div#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#h4#0;n#li#0;n#ul#0;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/getProjects.php">
+ <entry file="file://$PROJECT_DIR$/studentview/database/deleteProject.php">
<provider selected="true" editor-type-id="text-editor">
- <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" />
+ <state vertical-scroll-proportion="-20.709677">
+ <caret line="35" column="42" selection-start-line="35" selection-start-column="42" selection-end-line="35" selection-end-column="42" />
<folding>
- <marker date="1522147707095" expanded="true" signature="398:446" placeholder="SELECT * FRO... projects" />
+ <marker date="1522239553439" expanded="true" signature="444:496" placeholder="SELECT * FRO... projects" />
+ <marker date="1522239553439" expanded="true" signature="444:546" placeholder="SELECT * FRO... projects" />
+ <marker date="1522239553439" expanded="true" signature="759:861" placeholder="DELETE FROM " />
+ <marker date="1522239553439" expanded="true" signature="924:962" placeholder="DELETE FROM " />
+ <marker date="1522239553439" expanded="true" signature="924:977" placeholder="DELETE FROM " />
+ <marker date="1522239553439" expanded="true" signature="924:979" placeholder="DELETE FROM " />
</folding>
</state>
</provider>
</entry>
- <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.users">
- <provider selected="true" editor-type-id="com.intellij.database.editor.DatabaseTableFileEditorProvider">
- <state>
- <filtering enabled="true" />
- </state>
- </provider>
- <provider editor-type-id="text-editor">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/deleteProject.js">
+ <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
- <folding />
+ <caret line="14" column="161" selection-start-line="14" selection-start-column="161" selection-end-line="14" selection-end-column="161" />
+ <folding>
+ <element signature="e#0#42#0" expanded="false" />
+ </folding>
</state>
</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" />
+ <entry file="file://$PROJECT_DIR$/studentview/pages/deleteProject.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-7.806452">
+ <caret line="35" column="29" selection-start-line="35" selection-start-column="29" selection-end-line="35" selection-end-column="29" />
+ <folding />
</state>
</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" />
+ </entry>
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/utility.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.0">
+ <caret line="0" column="9" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/getProjectsOfAuthor.php">
+ <entry file="file://$PROJECT_DIR$/studentview/pages/projects.php">
<provider selected="true" editor-type-id="text-editor">
- <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="1522152079040" expanded="true" signature="425:487" placeholder="SELECT * FRO... projects" />
- </folding>
+ <state vertical-scroll-proportion="-24.838709">
+ <caret line="35" column="0" selection-start-line="35" selection-start-column="0" selection-end-line="35" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/putTagsAndPW.php">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/overview.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" />
+ <caret line="25" column="76" selection-start-line="25" selection-start-column="76" selection-end-line="25" selection-end-column="76" />
<folding>
- <marker date="1522074655857" expanded="true" signature="619:727" placeholder="INSERT INTO `projects`... " />
- <marker date="1522074655857" expanded="true" signature="782:860" placeholder="INSERT INTO `tags`... " />
+ <marker date="1523006332435" expanded="true" signature="872:1018" placeholder="..." />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/userExists.php">
+ <entry file="file://$PROJECT_DIR$/studentview/database/putProject.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" />
+ <state vertical-scroll-proportion="-13.225806">
+ <caret line="21" column="44" selection-start-line="21" selection-start-column="44" selection-end-line="21" selection-end-column="44" />
<folding>
- <marker date="1522074655864" expanded="true" signature="219:314" placeholder="SELECT (u.to... users" />
+ <marker date="1522074655855" expanded="true" signature="751:946" placeholder="INSERT INTO `projects`... " />
+ <marker date="1522074655855" expanded="true" signature="1001:1079" placeholder="INSERT INTO `tags`... " />
</folding>
</state>
</provider>
</entry>
- <entry file="dbDummy://dbtable:/fc3764cf/14340c2c-ac4b-492f-ac4f-18c0853598a8/fltrail.tags">
+ <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" />
@@ -1214,58 +1416,89 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/assets/js/overview.js">
+ <entry file="file://$PROJECT_DIR$/studentview/database/getProjects.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="-14.903226">
+ <caret line="21" column="4" selection-start-line="21" selection-start-column="4" selection-end-line="21" selection-end-column="60" />
+ <folding>
+ <marker date="1522147707095" expanded="true" signature="398:446" placeholder="SELECT * FRO... projects" />
+ </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="20" column="36" selection-start-line="20" selection-start-column="36" selection-end-line="20" selection-end-column="36" />
- <folding />
+ <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/pages/newproject.php">
+ <entry file="file://$PROJECT_DIR$/studentview/pages/mygroups.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-15.419354">
- <caret line="72" column="47" selection-start-line="72" selection-start-column="47" selection-end-line="72" selection-end-column="47" />
+ <state vertical-scroll-proportion="-37.774193">
+ <caret line="80" column="0" selection-start-line="80" selection-start-column="0" selection-end-line="80" selection-end-column="0" />
<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="157" column="35" selection-start-line="157" selection-start-column="35" selection-end-line="157" selection-end-column="35" />
+ <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/putProject.php">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/myGroupsInit.js">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-23.64516">
- <caret line="40" column="2" selection-start-line="40" selection-start-column="2" selection-end-line="40" selection-end-column="2" />
+ <state vertical-scroll-proportion="0.0">
+ <caret line="95" column="19" selection-start-line="95" selection-start-column="19" selection-end-line="95" selection-end-column="19" />
<folding>
- <marker date="1522074655855" expanded="true" signature="751:946" placeholder="INSERT INTO `projects`... " />
- <marker date="1522074655855" expanded="true" signature="1001:1079" placeholder="INSERT INTO `tags`... " />
+ <marker date="1523263140884" expanded="true" signature="2619:2668" placeholder="..." />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/database/deleteProject.php">
+ <entry file="file://$PROJECT_DIR$/studentview/pages/preferences.php">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="0.0">
- <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
+ <state vertical-scroll-proportion="-17.903225">
+ <caret line="28" column="71" selection-start-line="28" selection-start-column="71" selection-end-line="28" selection-end-column="71" />
<folding>
- <marker date="1522074655850" expanded="true" signature="317:369" placeholder="DELETE FROM " />
+ <marker date="1523263995275" expanded="true" signature="182:256" placeholder="SELECT (`id`... projects" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/studentview/pages/projects.php">
+ <entry file="file://$PROJECT_DIR$/studentview/assets/css/styles.css">
<provider selected="true" editor-type-id="text-editor">
- <state vertical-scroll-proportion="-2.1618497">
- <caret line="29" column="42" selection-start-line="29" selection-start-column="42" selection-end-line="29" selection-end-column="42" />
+ <state vertical-scroll-proportion="-224.25807">
+ <caret line="349" column="57" selection-start-line="349" selection-start-column="57" selection-end-line="349" selection-end-column="57" />
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/studentview/assets/js/createPreferences.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state vertical-scroll-proportion="0.5120385">
+ <caret line="111" column="54" selection-start-line="111" selection-start-column="54" selection-end-line="111" selection-end-column="54" />
+ <folding>
+ <marker date="1523268729248" expanded="true" signature="1662:1746" placeholder="..." />
+ <marker date="1523268729248" expanded="true" signature="2816:3052" placeholder="..." />
+ <marker date="1523268729248" expanded="true" signature="2817:3021" placeholder="..." />
+ <marker date="1523268729248" expanded="true" signature="2817:3052" placeholder="..." />
+ <marker date="1523268729248" expanded="true" signature="2844:2936" placeholder="..." />
+ <marker date="1523268729248" expanded="true" signature="2995:3021" placeholder="..." />
+ </folding>
+ </state>
+ </provider>
+ </entry>
</component>
</project>
\ No newline at end of file
diff --git a/studentview/.idea/workspace.xml b/studentview/.idea/workspace.xml
index a33d91e60ae5d8760a9a908c7493d2ee1966f207..342a0ed6fa7b1c1a0d0f6006ccf0d0432b82f668 100644
--- a/studentview/.idea/workspace.xml
+++ b/studentview/.idea/workspace.xml
@@ -35,10 +35,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
- <option name="x" value="-914" />
- <option name="y" value="1431" />
+ <option name="x" value="-9" />
+ <option name="y" value="-9" />
<option name="width" value="1938" />
- <option name="height" value="1098" />
+ <option name="height" value="1050" />
</component>
<component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
@@ -65,9 +65,9 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
- <pane id="PackagesPane" />
<pane id="Scratches" />
<pane id="Scope" />
+ <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -93,6 +93,7 @@
<component name="PropertiesComponent">
<property name="aspect.path.notification.shown" value="true" />
<property name="WebServerToolWindowFactoryState" value="true" />
+ <property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
</component>
<component name="RunManager">
<configuration default="true" type="#org.jetbrains.idea.devkit.run.PluginConfigurationType" factoryName="Plugin">
@@ -101,6 +102,65 @@
<option name="PROGRAM_PARAMETERS" />
<method />
</configuration>
+ <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application">
+ <module name="" />
+ <option name="ACTIVITY_CLASS" value="" />
+ <option name="MODE" value="default_activity" />
+ <option name="DEPLOY" value="true" />
+ <option name="ARTIFACT_NAME" value="" />
+ <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
+ <option name="USE_LAST_SELECTED_DEVICE" value="false" />
+ <option name="PREFERRED_AVD" value="" />
+ <option name="USE_COMMAND_LINE" value="true" />
+ <option name="COMMAND_LINE" value="" />
+ <option name="WIPE_USER_DATA" value="false" />
+ <option name="DISABLE_BOOT_ANIMATION" value="false" />
+ <option name="NETWORK_SPEED" value="full" />
+ <option name="NETWORK_LATENCY" value="none" />
+ <option name="CLEAR_LOGCAT" value="false" />
+ <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
+ <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
+ <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
+ <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+ <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" />
+ <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" />
+ <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" />
+ <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" />
+ <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" />
+ <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" />
+ <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" />
+ <method />
+ </configuration>
+ <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests">
+ <module name="" />
+ <option name="TESTING_TYPE" value="0" />
+ <option name="INSTRUMENTATION_RUNNER_CLASS" value="" />
+ <option name="METHOD_NAME" value="" />
+ <option name="CLASS_NAME" value="" />
+ <option name="PACKAGE_NAME" value="" />
+ <option name="TARGET_SELECTION_MODE" value="EMULATOR" />
+ <option name="USE_LAST_SELECTED_DEVICE" value="false" />
+ <option name="PREFERRED_AVD" value="" />
+ <option name="USE_COMMAND_LINE" value="true" />
+ <option name="COMMAND_LINE" value="" />
+ <option name="WIPE_USER_DATA" value="false" />
+ <option name="DISABLE_BOOT_ANIMATION" value="false" />
+ <option name="NETWORK_SPEED" value="full" />
+ <option name="NETWORK_LATENCY" value="none" />
+ <option name="CLEAR_LOGCAT" value="false" />
+ <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
+ <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
+ <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
+ <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
+ <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" />
+ <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" />
+ <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" />
+ <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" />
+ <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" />
+ <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" />
+ <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" />
+ <method />
+ </configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<option name="HTML_USED" value="false" />
<option name="WIDTH" value="400" />
@@ -124,6 +184,159 @@
<envs />
<method />
</configuration>
+ <configuration default="true" type="ArquillianJUnit" factoryName="">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <option name="arquillianRunConfiguration">
+ <value>
+ <option name="containerStateName" value="" />
+ </value>
+ </option>
+ <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" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" />
+ <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="ArquillianTestNG" factoryName="">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <option name="arquillianRunConfiguration">
+ <value>
+ <option name="containerStateName" value="" />
+ </value>
+ </option>
+ <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" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" />
+ <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="CucumberJavaRunConfigurationType" factoryName="Cucumber java">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <option name="myFilePath" />
+ <option name="GLUE" />
+ <option name="myNameFilter" />
+ <option name="myGeneratedName" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" />
+ <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 />
+ <method />
+ </configuration>
+ <configuration default="true" type="FlashRunConfigurationType" factoryName="Flash App">
+ <option name="BCName" value="" />
+ <option name="IOSSimulatorSdkPath" value="" />
+ <option name="adlOptions" value="" />
+ <option name="airProgramParameters" value="" />
+ <option name="appDescriptorForEmulator" value="Android" />
+ <option name="debugTransport" value="USB" />
+ <option name="debuggerSdkRaw" value="BC SDK" />
+ <option name="emulator" value="NexusOne" />
+ <option name="emulatorAdlOptions" value="" />
+ <option name="fastPackaging" value="true" />
+ <option name="fullScreenHeight" value="0" />
+ <option name="fullScreenWidth" value="0" />
+ <option name="launchUrl" value="false" />
+ <option name="launcherParameters">
+ <LauncherParameters>
+ <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
+ <option name="launcherType" value="OSDefault" />
+ <option name="newPlayerInstance" value="false" />
+ <option name="playerPath" value="FlashPlayerDebugger.exe" />
+ </LauncherParameters>
+ </option>
+ <option name="mobileRunTarget" value="Emulator" />
+ <option name="moduleName" value="" />
+ <option name="overriddenMainClass" value="" />
+ <option name="overriddenOutputFileName" value="" />
+ <option name="overrideMainClass" value="false" />
+ <option name="runTrusted" value="true" />
+ <option name="screenDpi" value="0" />
+ <option name="screenHeight" value="0" />
+ <option name="screenWidth" value="0" />
+ <option name="url" value="http://" />
+ <option name="usbDebugPort" value="7936" />
+ <method />
+ </configuration>
+ <configuration default="true" type="FlexUnitRunConfigurationType" factoryName="FlexUnit" appDescriptorForEmulator="Android" class_name="" emulatorAdlOptions="" method_name="" package_name="" scope="Class">
+ <option name="BCName" value="" />
+ <option name="launcherParameters">
+ <LauncherParameters>
+ <option name="browser" value="a7bb68e0-33c0-4d6f-a81a-aac1fdb870c8" />
+ <option name="launcherType" value="OSDefault" />
+ <option name="newPlayerInstance" value="false" />
+ <option name="playerPath" value="FlashPlayerDebugger.exe" />
+ </LauncherParameters>
+ </option>
+ <option name="moduleName" value="" />
+ <option name="trusted" value="true" />
+ <method />
+ </configuration>
+ <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle">
+ <ExternalSystemSettings>
+ <option name="executionName" />
+ <option name="externalProjectPath" />
+ <option name="externalSystemIdString" value="GRADLE" />
+ <option name="scriptParameters" />
+ <option name="taskDescriptions">
+ <list />
+ </option>
+ <option name="taskNames">
+ <list />
+ </option>
+ <option name="vmOptions" />
+ </ExternalSystemSettings>
+ <method />
+ </configuration>
+ <configuration default="true" type="GrailsRunConfigurationType" factoryName="Grails">
+ <module name="" />
+ <setting name="vmparams" value="" />
+ <setting name="cmdLine" value="run-app" />
+ <setting name="depsClasspath" value="false" />
+ <setting name="passParentEnv" value="true" />
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <setting name="launchBrowser" value="false" />
+ <method />
+ </configuration>
<configuration default="true" type="JUnit" factoryName="JUnit">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
@@ -145,6 +358,83 @@
<patterns />
<method />
</configuration>
+ <configuration default="true" type="JUnitTestDiscovery" factoryName="JUnit Test Discovery" changeList="All">
+ <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" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" />
+ <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="JarApplication" factoryName="JAR Application">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <envs />
+ <method />
+ </configuration>
+ <configuration default="true" type="Java Scratch" factoryName="Java Scratch">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <option name="SCRATCH_FILE_ID" value="0" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" />
+ <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 />
+ <method />
+ </configuration>
+ <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug">
+ <method />
+ </configuration>
+ <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
+ <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" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PASS_PARENT_ENVS" value="true" />
+ <module name="studentview" />
+ <envs />
+ <method />
+ </configuration>
+ <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <option name="filePath" />
+ <option name="vmParameters" />
+ <option name="alternativeJrePath" />
+ <option name="programParameters" />
+ <option name="passParentEnvs" value="true" />
+ <option name="workingDirectory" />
+ <option name="isAlternativeJrePathEnabled" value="false" />
+ <envs />
+ <method />
+ </configuration>
+ <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
+ <TestRunner />
+ <method />
+ </configuration>
+ <configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console">
+ <method />
+ </configuration>
<configuration default="true" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -153,6 +443,42 @@
<option name="PORT" value="5005" />
<method />
</configuration>
+ <configuration default="true" type="ScalaTestRunConfiguration" factoryName="ScalaTest">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <setting name="path" value="" />
+ <setting name="package" value="" />
+ <setting name="vmparams" value="" />
+ <setting name="params" value="" />
+ <setting name="workingDirectory" value="" />
+ <setting name="searchForTest" value="Across module dependencies" />
+ <setting name="testName" value="" />
+ <setting name="testKind" value="Class" />
+ <setting name="showProgressMessages" value="true" />
+ <envs />
+ <method />
+ </configuration>
+ <configuration default="true" type="Specs2RunConfiguration" factoryName="Specs2">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <setting name="path" value="" />
+ <setting name="package" value="" />
+ <setting name="vmparams" value="" />
+ <setting name="params" value="" />
+ <setting name="workingDirectory" value="" />
+ <setting name="searchForTest" value="Across module dependencies" />
+ <setting name="testName" value="" />
+ <setting name="testKind" value="Class" />
+ <setting name="showProgressMessages" value="true" />
+ <envs />
+ <method />
+ </configuration>
+ <configuration default="true" type="SpringBootApplicationConfigurationType" factoryName="Spring Boot">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <envs />
+ <method />
+ </configuration>
<configuration default="true" type="TestNG" factoryName="TestNG">
<extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
<module name="" />
@@ -181,6 +507,69 @@
<listeners />
<method />
</configuration>
+ <configuration default="true" type="TestNGTestDiscovery" factoryName="TestNG Test Discovery" changeList="All">
+ <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" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" />
+ <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.gulp" factoryName="Gulp.js">
+ <node-options />
+ <gulpfile />
+ <tasks />
+ <arguments />
+ <envs />
+ <method />
+ </configuration>
+ <configuration default="true" type="js.build_tools.npm" factoryName="npm">
+ <command value="run-script" />
+ <scripts />
+ <envs />
+ <method />
+ </configuration>
+ <configuration default="true" type="osgi.bnd.run" factoryName="Run Launcher">
+ <method />
+ </configuration>
+ <configuration default="true" type="osgi.bnd.run" factoryName="Test Launcher (JUnit)">
+ <method />
+ </configuration>
+ <configuration default="true" type="uTestRunConfiguration" factoryName="utest">
+ <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
+ <module name="" />
+ <setting name="path" value="" />
+ <setting name="package" value="" />
+ <setting name="vmparams" value="" />
+ <setting name="params" value="" />
+ <setting name="workingDirectory" value="" />
+ <setting name="searchForTest" value="Across module dependencies" />
+ <setting name="testName" value="" />
+ <setting name="testKind" value="Class" />
+ <setting name="showProgressMessages" value="true" />
+ <envs />
+ <method />
+ </configuration>
</component>
<component name="SbtLocalSettings">
<option name="externalProjectsViewState">
@@ -196,14 +585,16 @@
<updated>1522142538267</updated>
<workItem from="1522142543338" duration="40000" />
<workItem from="1522142603790" duration="30000" />
+ <workItem from="1522913635645" duration="807000" />
+ <workItem from="1522918310016" duration="8000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="70000" />
+ <option name="totallyTimeSpent" value="885000" />
</component>
<component name="ToolWindowManager">
- <frame x="-914" y="1431" width="1938" height="1098" extended-state="6" />
+ <frame x="-9" y="-9" width="1938" height="1050" extended-state="6" />
<editor active="false" />
<layout>
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
diff --git a/studentview/assets/css/styles.css b/studentview/assets/css/styles.css
index 0f703eb4a4f9f869905d580cf16d153c9d858b75..51a30b0dd9cb1987e7d8c71cd72bbba19a31f3a5 100644
--- a/studentview/assets/css/styles.css
+++ b/studentview/assets/css/styles.css
@@ -94,4 +94,288 @@
transform: perspective(140px) rotateY(180deg);
opacity: 0;
}
-}
\ No newline at end of file
+}
+
+
+.checkbox {
+ padding-left: 20px; }
+.checkbox label {
+ display: inline-block;
+ vertical-align: middle;
+ position: relative;
+ padding-left: 5px; }
+.checkbox label::before {
+ content: "";
+ display: inline-block;
+ position: absolute;
+ width: 17px;
+ height: 17px;
+ left: 0;
+ margin-left: -20px;
+ border: 1px solid #cccccc;
+ border-radius: 3px;
+ background-color: #fff;
+ -webkit-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
+ -o-transition: border 0.15s ease-in-out, color 0.15s ease-in-out;
+ transition: border 0.15s ease-in-out, color 0.15s ease-in-out; }
+.checkbox label::after {
+ display: inline-block;
+ position: absolute;
+ width: 16px;
+ height: 16px;
+ left: 0;
+ top: 0;
+ margin-left: -20px;
+ padding-left: 3px;
+ padding-top: 1px;
+ font-size: 11px;
+ color: #555555; }
+.checkbox input[type="checkbox"],
+.checkbox input[type="radio"] {
+ opacity: 0;
+ z-index: 1;
+ cursor: pointer;
+}
+.checkbox input[type="checkbox"]:focus + label::before,
+.checkbox input[type="radio"]:focus + label::before {
+ outline: thin dotted;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px; }
+.checkbox input[type="checkbox"]:checked + label::after,
+.checkbox input[type="radio"]:checked + label::after {
+ font-family: "FontAwesome";
+ content: "\f00c";}
+.checkbox input[type="checkbox"]:indeterminate + label::after,
+.checkbox input[type="radio"]:indeterminate + label::after {
+ display: block;
+ content: "";
+ width: 10px;
+ height: 3px;
+ background-color: #555555;
+ border-radius: 2px;
+ margin-left: -16.5px;
+ margin-top: 7px;
+}
+.checkbox input[type="checkbox"]:disabled,
+.checkbox input[type="radio"]:disabled {
+ cursor: not-allowed;
+}
+.checkbox input[type="checkbox"]:disabled + label,
+.checkbox input[type="radio"]:disabled + label {
+ opacity: 0.65; }
+.checkbox input[type="checkbox"]:disabled + label::before,
+.checkbox input[type="radio"]:disabled + label::before {
+ background-color: #eeeeee;
+ cursor: not-allowed; }
+.checkbox.checkbox-circle label::before {
+ border-radius: 50%; }
+.checkbox.checkbox-inline {
+ margin-top: 0; }
+
+.checkbox-primary input[type="checkbox"]:checked + label::before,
+.checkbox-primary input[type="radio"]:checked + label::before {
+ background-color: #337ab7;
+ border-color: #337ab7; }
+.checkbox-primary input[type="checkbox"]:checked + label::after,
+.checkbox-primary input[type="radio"]:checked + label::after {
+ color: #fff; }
+
+.checkbox-danger input[type="checkbox"]:checked + label::before,
+.checkbox-danger input[type="radio"]:checked + label::before {
+ background-color: #d9534f;
+ border-color: #d9534f; }
+.checkbox-danger input[type="checkbox"]:checked + label::after,
+.checkbox-danger input[type="radio"]:checked + label::after {
+ color: #fff; }
+
+.checkbox-info input[type="checkbox"]:checked + label::before,
+.checkbox-info input[type="radio"]:checked + label::before {
+ background-color: #5bc0de;
+ border-color: #5bc0de; }
+.checkbox-info input[type="checkbox"]:checked + label::after,
+.checkbox-info input[type="radio"]:checked + label::after {
+ color: #fff; }
+
+.checkbox-warning input[type="checkbox"]:checked + label::before,
+.checkbox-warning input[type="radio"]:checked + label::before {
+ background-color: #f0ad4e;
+ border-color: #f0ad4e; }
+.checkbox-warning input[type="checkbox"]:checked + label::after,
+.checkbox-warning input[type="radio"]:checked + label::after {
+ color: #fff; }
+
+.checkbox-success input[type="checkbox"]:checked + label::before,
+.checkbox-success input[type="radio"]:checked + label::before {
+ background-color: #5cb85c;
+ border-color: #5cb85c; }
+.checkbox-success input[type="checkbox"]:checked + label::after,
+.checkbox-success input[type="radio"]:checked + label::after {
+ color: #fff;}
+
+.checkbox-primary input[type="checkbox"]:indeterminate + label::before,
+.checkbox-primary input[type="radio"]:indeterminate + label::before {
+ background-color: #337ab7;
+ border-color: #337ab7;
+}
+
+.checkbox-primary input[type="checkbox"]:indeterminate + label::after,
+.checkbox-primary input[type="radio"]:indeterminate + label::after {
+ background-color: #fff;
+}
+
+.checkbox-danger input[type="checkbox"]:indeterminate + label::before,
+.checkbox-danger input[type="radio"]:indeterminate + label::before {
+ background-color: #d9534f;
+ border-color: #d9534f;
+}
+
+.checkbox-danger input[type="checkbox"]:indeterminate + label::after,
+.checkbox-danger input[type="radio"]:indeterminate + label::after {
+ background-color: #fff;
+}
+
+.checkbox-info input[type="checkbox"]:indeterminate + label::before,
+.checkbox-info input[type="radio"]:indeterminate + label::before {
+ background-color: #5bc0de;
+ border-color: #5bc0de;
+}
+
+.checkbox-info input[type="checkbox"]:indeterminate + label::after,
+.checkbox-info input[type="radio"]:indeterminate + label::after {
+ background-color: #fff;
+}
+
+.checkbox-warning input[type="checkbox"]:indeterminate + label::before,
+.checkbox-warning input[type="radio"]:indeterminate + label::before {
+ background-color: #f0ad4e;
+ border-color: #f0ad4e;
+}
+
+.checkbox-warning input[type="checkbox"]:indeterminate + label::after,
+.checkbox-warning input[type="radio"]:indeterminate + label::after {
+ background-color: #fff;
+}
+
+.checkbox-success input[type="checkbox"]:indeterminate + label::before,
+.checkbox-success input[type="radio"]:indeterminate + label::before {
+ background-color: #5cb85c;
+ border-color: #5cb85c;
+}
+
+.checkbox-success input[type="checkbox"]:indeterminate + label::after,
+.checkbox-success input[type="radio"]:indeterminate + label::after {
+ background-color: #fff;
+}
+
+.radio {
+ padding-left: 20px; }
+.radio label {
+ display: inline-block;
+ vertical-align: middle;
+ position: relative;
+ padding-left: 5px; }
+.radio label::before {
+ content: "";
+ display: inline-block;
+ position: absolute;
+ width: 17px;
+ height: 17px;
+ left: 0;
+ margin-left: -20px;
+ border: 1px solid #cccccc;
+ border-radius: 50%;
+ background-color: #fff;
+ -webkit-transition: border 0.15s ease-in-out;
+ -o-transition: border 0.15s ease-in-out;
+ transition: border 0.15s ease-in-out; }
+.radio label::after {
+ display: inline-block;
+ position: absolute;
+ content: " ";
+ width: 11px;
+ height: 11px;
+ left: 3px;
+ top: 3px;
+ margin-left: -20px;
+ border-radius: 50%;
+ background-color: #555555;
+ -webkit-transform: scale(0, 0);
+ -ms-transform: scale(0, 0);
+ -o-transform: scale(0, 0);
+ transform: scale(0, 0);
+ -webkit-transition: -webkit-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
+ -moz-transition: -moz-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
+ -o-transition: -o-transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33);
+ transition: transform 0.1s cubic-bezier(0.8, -0.33, 0.2, 1.33); }
+.radio input[type="radio"] {
+ opacity: 0;
+ z-index: 1;
+ cursor: pointer;
+}
+.radio input[type="radio"]:focus + label::before {
+ outline: thin dotted;
+ outline: 5px auto -webkit-focus-ring-color;
+ outline-offset: -2px; }
+.radio input[type="radio"]:checked + label::after {
+ -webkit-transform: scale(1, 1);
+ -ms-transform: scale(1, 1);
+ -o-transform: scale(1, 1);
+ transform: scale(1, 1); }
+.radio input[type="radio"]:disabled {
+ cursor: not-allowed;
+}
+.radio input[type="radio"]:disabled + label {
+ opacity: 0.65; }
+.radio input[type="radio"]:disabled + label::before {
+ cursor: not-allowed; }
+.radio.radio-inline {
+ margin-top: 0; }
+
+.radio-primary input[type="radio"] + label::after {
+ background-color: #337ab7; }
+.radio-primary input[type="radio"]:checked + label::before {
+ border-color: #337ab7; }
+.radio-primary input[type="radio"]:checked + label::after {
+ background-color: #337ab7; }
+
+.radio-danger input[type="radio"] + label::after {
+ background-color: #d9534f; }
+.radio-danger input[type="radio"]:checked + label::before {
+ border-color: #d9534f; }
+.radio-danger input[type="radio"]:checked + label::after {
+ background-color: #d9534f; }
+
+.radio-info input[type="radio"] + label::after {
+ background-color: #5bc0de; }
+.radio-info input[type="radio"]:checked + label::before {
+ border-color: #5bc0de; }
+.radio-info input[type="radio"]:checked + label::after {
+ background-color: #5bc0de; }
+
+.radio-warning input[type="radio"] + label::after {
+ background-color: #f0ad4e; }
+.radio-warning input[type="radio"]:checked + label::before {
+ border-color: #f0ad4e; }
+.radio-warning input[type="radio"]:checked + label::after {
+ background-color: #f0ad4e; }
+
+.radio-success input[type="radio"] + label::after {
+ background-color: #5cb85c; }
+.radio-success input[type="radio"]:checked + label::before {
+ border-color: #5cb85c; }
+.radio-success input[type="radio"]:checked + label::after {
+ background-color: #5cb85c; }
+
+input[type="checkbox"].styled:checked + label:after,
+input[type="radio"].styled:checked + label:after {
+ font-family: 'FontAwesome';
+ content: "\f00c"; }
+input[type="checkbox"] .styled:checked + label::before,
+input[type="radio"] .styled:checked + label::before {
+ color: #fff; }
+input[type="checkbox"] .styled:checked + label::after,
+input[type="radio"] .styled:checked + label::after {
+ color: #fff; }
+
+
+
diff --git a/studentview/assets/js/createPreferences.js b/studentview/assets/js/createPreferences.js
index f1ad4c5858b23535c6567a71b642d2e0c8f686ea..353a8c6e5250059c1247fd58cee162b2b29055eb 100644
--- a/studentview/assets/js/createPreferences.js
+++ b/studentview/assets/js/createPreferences.js
@@ -63,11 +63,11 @@ function getTags(projectName) {
tagList.push(response[i].tag);
for (i = 0; i < tagList.length; i++) {
var newInput = document.createElement("label");
- newInput.innerHTML = tagList[i] + "<input style='margin-right:10px;' " +
- "type='checkbox' " +
- "name='tag' " +
- "id='tag" + i + "' " +
- "value=" + tagList[i] + ">";
+ newInput.innerHTML =
+ "<div class='checkbox checkbox-primary' >"
+ + "<input id='tag" + i + "' " + " class='styled' " + "name='tag'" + "type='checkbox' " + ">"
+ + "<label for='tag" + i + "' "+ ">" + tagList[i] + "</label>"
+ + "</div>";
var div = document.getElementById('tags');
div.appendChild(newInput);
}
@@ -101,14 +101,16 @@ function takesPartInProject() {
allTheCompetencies.push("Die Studierenden interessieren sich für " + $("#tag" + i).val()); //todo: Die Tags werden hinter der Schnittstelle noch nicht verwertet, daher diese schnelle Lösung
}
if (allTheTags.length > 2) {
- alert('Sie haben zu viele Tags ausgewählt');
+ //alert('Sie haben zu viele Tags ausgewählt');
+ $(".alert").css('background-color', 'lightcoral');
allTheTags = [];
document.getElementById('loader').className = "loader-inactive";
document.getElementById('wrapper').className = "wrapper";
return false;
}
if (allTheTags.length < 2) {
- alert('Sie haben zu wenig Tags ausgewählt');
+ //alert('Sie haben zu wenig Tags ausgewählt');
+ $(".alert").css('background-color', 'lightcoral');
allTheTags = [];
document.getElementById('loader').className = "loader-inactive";
document.getElementById('wrapper').className = "wrapper";
diff --git a/studentview/pages/preferences.php b/studentview/pages/preferences.php
index 08e2c4c5e2091209913966b04518b3d078c14839..c00014a466198f520444652bd6639550b5d63c9a 100644
--- a/studentview/pages/preferences.php
+++ b/studentview/pages/preferences.php
@@ -26,6 +26,7 @@ $projectName = $resultObj->id;
<link rel="stylesheet" href="../assets/css/Sidebar-Menu.css">
<link rel="stylesheet" href="../assets/css/Sidebar-Menu1.css">
<link rel="stylesheet" href="../assets/css/styles.css">
+ <link rel="stylesheet" href="../assets/fonts/font-awesome.min.css">
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script src="../assets/js/createPreferences.js"></script>
<script src="../assets/bootstrap/js/bootstrap.min.js"></script>