diff --git a/studentview/.idea/misc.xml b/studentview/.idea/misc.xml
index e5d2fb2cf03441ff41ba08481f33f738964582f0..39bbe98abae488022b10ef63ec3be29a2a6f4ad1 100644
--- a/studentview/.idea/misc.xml
+++ b/studentview/.idea/misc.xml
@@ -7,19 +7,6 @@
</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">
diff --git a/studentview/.idea/studentview.iml b/studentview/.idea/studentview.iml
new file mode 100644
index 0000000000000000000000000000000000000000..e28549da18506eb13e5c4cf5ebf1bc7fde7665b0
--- /dev/null
+++ b/studentview/.idea/studentview.iml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+ <component name="NewModuleRootManager" inherit-compiler-output="false">
+ <content url="file://$MODULE_DIR$" />
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/studentview/.idea/workspace.xml b/studentview/.idea/workspace.xml
index 342a0ed6fa7b1c1a0d0f6006ccf0d0432b82f668..6151e5c9ae2d4a61dbaa5971a29a1050223ab667 100644
--- a/studentview/.idea/workspace.xml
+++ b/studentview/.idea/workspace.xml
@@ -12,7 +12,6 @@
<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>
@@ -20,35 +19,166 @@
<component name="FavoritesManager">
<favorites_list name="studentview" />
</component>
+ <component name="FileEditorManager">
+ <leaf>
+ <file leaf-file-name="config.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/database/config.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="105">
+ <caret line="10" column="0" lean-forward="true" 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="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="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="1524554408748" expanded="true" signature="398:446" ph="SELECT * FRO... projects" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="projects.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/pages/projects.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="658">
+ <caret line="44" column="15" lean-forward="false" selection-start-line="44" selection-start-column="9" selection-end-line="44" selection-end-column="15" />
+ <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="1973">
+ <caret line="106" column="13" lean-forward="true" selection-start-line="106" selection-start-column="13" selection-end-line="106" selection-end-column="13" />
+ <folding>
+ <element signature="n#style#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <marker date="1524555633251" expanded="true" signature="182:256" ph="SELECT (`id`... projects" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="overview.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/assets/js/overview.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="416">
+ <caret line="25" column="32" lean-forward="false" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="32" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="deleteProject.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/pages/deleteProject.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-274">
+ <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>
+ </file>
+ <file leaf-file-name="deleteProject.js" pinned="false" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/assets/js/deleteProject.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="693">
+ <caret line="33" column="41" lean-forward="false" selection-start-line="33" selection-start-column="41" selection-end-line="33" selection-end-column="41" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="getProjectsOfAuthor.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/database/getProjectsOfAuthor.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="1524466368852" expanded="true" signature="425:487" ph="SELECT a.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="756">
+ <caret line="57" column="50" lean-forward="true" selection-start-line="57" selection-start-column="50" selection-end-line="57" selection-end-column="50" />
+ <folding>
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#1;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#2;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#3;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#7;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="deleteProject.php" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/database/deleteProject.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="861">
+ <caret line="41" column="18" lean-forward="false" selection-start-line="41" selection-start-column="18" selection-end-line="41" selection-end-column="18" />
+ <folding>
+ <marker date="1524554408742" expanded="true" signature="444:546" ph="SELECT * FRO... projects" />
+ <marker date="1524554408742" expanded="true" signature="759:861" ph="DELETE FROM " />
+ <marker date="1524554408742" expanded="true" signature="924:979" ph="DELETE FROM " />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
+ </component>
+ <component name="FindInProjectRecents">
+ <findStrings>
+ <find>exact</find>
+ <find>p</find>
+ <find>delete</find>
+ </findStrings>
+ </component>
<component name="GradleLocalSettings">
<option name="externalProjectsViewState">
<projects_view />
</option>
</component>
- <component name="JsBuildToolGruntFileManager" detection-done="true" />
- <component name="JsBuildToolPackageJson" detection-done="true" />
+ <component name="IdeDocumentHistory">
+ <option name="CHANGED_PATHS">
+ <list>
+ <option value="$PROJECT_DIR$/database/config.php" />
+ <option value="$PROJECT_DIR$/pages/newproject.php" />
+ <option value="$PROJECT_DIR$/pages/preferences.php" />
+ <option value="$PROJECT_DIR$/assets/js/overview.js" />
+ <option value="$PROJECT_DIR$/database/deleteProject.php" />
+ <option value="$PROJECT_DIR$/assets/js/deleteProject.js" />
+ </list>
+ </option>
+ </component>
+ <component name="JsBuildToolGruntFileManager" detection-done="true" sorting="DEFINITION_ORDER" />
+ <component name="JsBuildToolPackageJson" detection-done="true" sorting="DEFINITION_ORDER" />
<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="-9" />
- <option name="y" value="-9" />
- <option name="width" value="1938" />
- <option name="height" value="1050" />
- </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" />
+ <option name="x" value="-359" />
+ <option name="y" value="-1449" />
+ <option name="width" value="2578" />
+ <option name="height" value="1458" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
@@ -67,7 +197,6 @@
<panes>
<pane id="Scratches" />
<pane id="Scope" />
- <pane id="PackagesPane" />
<pane id="ProjectPane">
<subPane>
<PATH>
@@ -75,6 +204,38 @@
<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>
@@ -83,11 +244,34 @@
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="studentview" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ <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>
</subPane>
</pane>
+ <pane id="PackagesPane" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -95,339 +279,22 @@
<property name="WebServerToolWindowFactoryState" value="true" />
<property name="js-jscs-nodeInterpreter" value="C:\Program Files\nodejs\node.exe" />
</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">
- <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="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" />
- <option name="HEIGHT" value="300" />
- <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
- <module />
- <method />
- </configuration>
- <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 />
- <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="" />
- <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="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 />
@@ -435,107 +302,8 @@
<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" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <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="" />
- <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="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-interpreter>project</node-interpreter>
<node-options />
<gulpfile />
<tasks />
@@ -544,29 +312,9 @@
<method />
</configuration>
<configuration default="true" type="js.build_tools.npm" factoryName="npm">
- <command value="run-script" />
+ <command value="run" />
<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" />
+ <node-interpreter value="project" />
<envs />
<method />
</configuration>
@@ -576,57 +324,64 @@
<projects_view />
</option>
</component>
- <component name="ShelveChangesManager" show_recycled="false" />
+ <component name="ShelveChangesManager" show_recycled="false">
+ <option name="remove_strategy" value="false" />
+ </component>
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="3c5c4f85-4011-437d-8046-b77c883995a1" name="Default" comment="" />
<created>1522142538267</created>
<option name="number" value="Default" />
+ <option name="presentableId" value="Default" />
<updated>1522142538267</updated>
<workItem from="1522142543338" duration="40000" />
<workItem from="1522142603790" duration="30000" />
<workItem from="1522913635645" duration="807000" />
<workItem from="1522918310016" duration="8000" />
+ <workItem from="1524554429163" duration="2902000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="885000" />
+ <option name="totallyTimeSpent" value="3787000" />
</component>
<component name="ToolWindowManager">
- <frame x="-9" y="-9" width="1938" height="1050" extended-state="6" />
- <editor active="false" />
+ <frame x="-359" y="-1449" width="2578" height="1458" extended-state="6" />
+ <editor active="true" />
<layout>
+ <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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.20117188" 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="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="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="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="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="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="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="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="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="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="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="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="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="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="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>
<component name="Vcs.Log.UiProperties">
<option name="RECENTLY_FILTERED_USER_GROUPS">
<collection />
@@ -642,4 +397,143 @@
<breakpoint-manager />
<watches-manager />
</component>
+ <component name="editorHistoryManager">
+ <entry file="file://$PROJECT_DIR$/pages/menu.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$/pages/mygroups.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-568">
+ <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$/assets/js/newProject.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="416">
+ <caret line="34" column="13" lean-forward="false" selection-start-line="34" selection-start-column="8" selection-end-line="34" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pages/preferences.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="1973">
+ <caret line="106" column="13" lean-forward="true" selection-start-line="106" selection-start-column="13" selection-end-line="106" selection-end-column="13" />
+ <folding>
+ <element signature="n#style#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <marker date="1524555633251" expanded="true" signature="182:256" ph="SELECT (`id`... projects" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pages/newproject.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="756">
+ <caret line="57" column="50" lean-forward="true" selection-start-line="57" selection-start-column="50" selection-end-line="57" selection-end-column="50" />
+ <folding>
+ <element signature="n#style#0;n#div#0;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#1;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#2;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#3;n#div#1;n#div#1;n#body#0;n#html#0;n#!!top" expanded="true" />
+ <element signature="n#style#0;n#div#7;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$/database/config.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="105">
+ <caret line="10" column="0" lean-forward="true" 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/showProjects.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" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/database/getProjectsOfAuthor.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="1524466368852" expanded="true" signature="425:487" ph="SELECT a.id projects" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/database/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>
+ <marker date="1524554408748" expanded="true" signature="398:446" ph="SELECT * FRO... projects" />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/database/deleteProject.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="861">
+ <caret line="41" column="18" lean-forward="false" selection-start-line="41" selection-start-column="18" selection-end-line="41" selection-end-column="18" />
+ <folding>
+ <marker date="1524554408742" expanded="true" signature="444:546" ph="SELECT * FRO... projects" />
+ <marker date="1524554408742" expanded="true" signature="759:861" ph="DELETE FROM " />
+ <marker date="1524554408742" expanded="true" signature="924:979" ph="DELETE FROM " />
+ </folding>
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/assets/js/getProjects.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="504">
+ <caret line="24" column="13" lean-forward="true" selection-start-line="24" selection-start-column="13" selection-end-line="24" selection-end-column="13" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/pages/deleteProject.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="-274">
+ <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$/pages/projects.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="658">
+ <caret line="44" column="15" lean-forward="false" selection-start-line="44" selection-start-column="9" selection-end-line="44" selection-end-column="15" />
+ <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="416">
+ <caret line="25" column="32" lean-forward="false" selection-start-line="25" selection-start-column="26" selection-end-line="25" selection-end-column="32" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/assets/js/deleteProject.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="693">
+ <caret line="33" column="41" lean-forward="false" selection-start-line="33" selection-start-column="41" selection-end-line="33" selection-end-column="41" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </component>
</project>
\ No newline at end of file
diff --git a/studentview/assets/dummyGroups.json b/studentview/assets/dummyGroups.json
deleted file mode 100644
index c3e07bba622cf0f4ab0794cca98f4ae69b3e56f0..0000000000000000000000000000000000000000
--- a/studentview/assets/dummyGroups.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
- "compilerOptions": {
- "module": "commonjs",
- "target": "es5",
- "sourceMap": true
- },
- "exclude": [
- "node_modules"
- ],
- "student2": {
- "name": "student2",
- "competence": "is able to",
- "researchQuestion": "researchQuestion2",
- "tags": "Tags"
- },
- "student3": {
- "name": "student3",
- "competence": "is unable to",
- "researchQuestion": "researchQuestion3",
- "tags": "Tags"
- },
- "student4": {
- "name": "student4",
- "competence": "is almost able to",
- "researchQuestion": "researchQuestion4",
- "tags": "Tags"
- },
- "student5": {
- "name": "student5",
- "competence": "was able to",
- "researchQuestion": "researchQuestion5",
- "tags": "Tags"
- },
- "student6": {
- "name": "student6",
- "competence": "would like to be able to",
- "researchQuestion": "researchQuestion6",
- "tags": "Tags"
- }
-}
\ No newline at end of file
diff --git a/studentview/assets/egal.html b/studentview/assets/egal.html
deleted file mode 100644
index 6191c9787c2c5a000bbdb8299a4e577a759831e3..0000000000000000000000000000000000000000
--- a/studentview/assets/egal.html
+++ /dev/null
@@ -1,75 +0,0 @@
-<html><head><title>Apache Tomcat/7.0.61 - Error report</title><style><!--H1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;} H2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;} H3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;} BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;} B {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;} P {font-family:Tahoma,Arial,sans-serif;background:white;color:black;font-size:12px;}A {color : black;}A.name {color : black;}HR {color : #525D76;}--></style> </head><body><h1>HTTP Status 500 - org.glassfish.jersey.server.ContainerException: com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException: Unrecognized field "author" (class uzuzjmd.competence.shared.course.CourseData), not marked as ignorable (3 known properties: "printableName", "competences", "courseId"])</h1><HR size="1" noshade="noshade"><p><b>type</b> Exception report</p><p><b>message</b> <u>org.glassfish.jersey.server.ContainerException: com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException: Unrecognized field "author" (class uzuzjmd.competence.shared.course.CourseData), not marked as ignorable (3 known properties: "printableName", "competences", "courseId"])</u></p><p><b>description</b> <u>The server encountered an internal error that prevented it from fulfilling this request.</u></p><p><b>exception</b> <pre>javax.servlet.ServletException: org.glassfish.jersey.server.ContainerException: com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException: Unrecognized field "author" (class uzuzjmd.competence.shared.course.CourseData), not marked as ignorable (3 known properties: "printableName", "competences", "courseId"])
- at [Source: org.glassfish.jersey.message.internal.EntityInputStream@2adbf3e1; line: 1, column: 126] (through reference chain: uzuzjmd.competence.shared.course.CourseData["author"])
- org.glassfish.jersey.servlet.WebComponent.service(WebComponent.java:392)
- org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:381)
- org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:344)
- org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:219)
- org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)
- org.apache.catalina.filters.CorsFilter.handleSimpleCORS(CorsFilter.java:303)
- org.apache.catalina.filters.CorsFilter.doFilter(CorsFilter.java:171)
-</pre></p><p><b>root cause</b> <pre>org.glassfish.jersey.server.ContainerException: com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException: Unrecognized field "author" (class uzuzjmd.competence.shared.course.CourseData), not marked as ignorable (3 known properties: "printableName", "competences", "courseId"])
- at [Source: org.glassfish.jersey.message.internal.EntityInputStream@2adbf3e1; line: 1, column: 126] (through reference chain: uzuzjmd.competence.shared.course.CourseData["author"])
- org.glassfish.jersey.servlet.internal.ResponseWriter.rethrow(ResponseWriter.java:249)
- org.glassfish.jersey.servlet.internal.ResponseWriter.failure(ResponseWriter.java:231)
- org.glassfish.jersey.server.ServerRuntime$Responder.process(ServerRuntime.java:433)
- org.glassfish.jersey.server.ServerRuntime$1.run(ServerRuntime.java:265)
- org.glassfish.jersey.internal.Errors$1.call(Errors.java:271)
- org.glassfish.jersey.internal.Errors$1.call(Errors.java:267)
- org.glassfish.jersey.internal.Errors.process(Errors.java:315)
- org.glassfish.jersey.internal.Errors.process(Errors.java:297)
- org.glassfish.jersey.internal.Errors.process(Errors.java:267)
- org.glassfish.jersey.process.internal.RequestScope.runInScope(RequestScope.java:319)
- org.glassfish.jersey.server.ServerRuntime.process(ServerRuntime.java:236)
- org.glassfish.jersey.server.ApplicationHandler.handle(ApplicationHandler.java:1028)
- org.glassfish.jersey.servlet.WebComponent.service(WebComponent.java:373)
- org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:381)
- org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:344)
- org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:219)
- org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)
- org.apache.catalina.filters.CorsFilter.handleSimpleCORS(CorsFilter.java:303)
- org.apache.catalina.filters.CorsFilter.doFilter(CorsFilter.java:171)
-</pre></p><p><b>root cause</b> <pre>com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException: Unrecognized field "author" (class uzuzjmd.competence.shared.course.CourseData), not marked as ignorable (3 known properties: "printableName", "competences", "courseId"])
- at [Source: org.glassfish.jersey.message.internal.EntityInputStream@2adbf3e1; line: 1, column: 126] (through reference chain: uzuzjmd.competence.shared.course.CourseData["author"])
- com.fasterxml.jackson.databind.exc.UnrecognizedPropertyException.from(UnrecognizedPropertyException.java:51)
- com.fasterxml.jackson.databind.DeserializationContext.reportUnknownProperty(DeserializationContext.java:744)
- com.fasterxml.jackson.databind.deser.std.StdDeserializer.handleUnknownProperty(StdDeserializer.java:915)
- com.fasterxml.jackson.databind.deser.BeanDeserializerBase.handleUnknownProperty(BeanDeserializerBase.java:1306)
- com.fasterxml.jackson.databind.deser.BeanDeserializerBase.handleUnknownVanilla(BeanDeserializerBase.java:1284)
- com.fasterxml.jackson.databind.deser.BeanDeserializer.vanillaDeserialize(BeanDeserializer.java:243)
- com.fasterxml.jackson.databind.deser.BeanDeserializer.deserialize(BeanDeserializer.java:118)
- com.fasterxml.jackson.databind.ObjectReader._bind(ObjectReader.java:1232)
- com.fasterxml.jackson.databind.ObjectReader.readValue(ObjectReader.java:676)
- com.fasterxml.jackson.jaxrs.base.ProviderBase.readFrom(ProviderBase.java:808)
- org.glassfish.jersey.message.internal.ReaderInterceptorExecutor$TerminalReaderInterceptor.invokeReadFrom(ReaderInterceptorExecutor.java:251)
- org.glassfish.jersey.message.internal.ReaderInterceptorExecutor$TerminalReaderInterceptor.aroundReadFrom(ReaderInterceptorExecutor.java:229)
- org.glassfish.jersey.message.internal.ReaderInterceptorExecutor.proceed(ReaderInterceptorExecutor.java:149)
- org.glassfish.jersey.server.internal.MappableExceptionWrapperInterceptor.aroundReadFrom(MappableExceptionWrapperInterceptor.java:72)
- org.glassfish.jersey.message.internal.ReaderInterceptorExecutor.proceed(ReaderInterceptorExecutor.java:149)
- org.glassfish.jersey.message.internal.MessageBodyFactory.readFrom(MessageBodyFactory.java:1124)
- org.glassfish.jersey.message.internal.InboundMessageContext.readEntity(InboundMessageContext.java:853)
- org.glassfish.jersey.server.ContainerRequest.readEntity(ContainerRequest.java:262)
- org.glassfish.jersey.server.internal.inject.EntityParamValueFactoryProvider$EntityValueFactory.provide(EntityParamValueFactoryProvider.java:96)
- org.glassfish.jersey.server.spi.internal.ParameterValueHelper.getParameterValues(ParameterValueHelper.java:81)
- org.glassfish.jersey.server.model.internal.JavaResourceMethodDispatcherProvider$AbstractMethodParamInvoker.getParamValues(JavaResourceMethodDispatcherProvider.java:121)
- org.glassfish.jersey.server.model.internal.JavaResourceMethodDispatcherProvider$ResponseOutInvoker.doDispatch(JavaResourceMethodDispatcherProvider.java:152)
- org.glassfish.jersey.server.model.internal.AbstractJavaResourceMethodDispatcher.dispatch(AbstractJavaResourceMethodDispatcher.java:104)
- org.glassfish.jersey.server.model.ResourceMethodInvoker.invoke(ResourceMethodInvoker.java:406)
- org.glassfish.jersey.server.model.ResourceMethodInvoker.apply(ResourceMethodInvoker.java:350)
- org.glassfish.jersey.server.model.ResourceMethodInvoker.apply(ResourceMethodInvoker.java:106)
- org.glassfish.jersey.server.ServerRuntime$1.run(ServerRuntime.java:259)
- org.glassfish.jersey.internal.Errors$1.call(Errors.java:271)
- org.glassfish.jersey.internal.Errors$1.call(Errors.java:267)
- org.glassfish.jersey.internal.Errors.process(Errors.java:315)
- org.glassfish.jersey.internal.Errors.process(Errors.java:297)
- org.glassfish.jersey.internal.Errors.process(Errors.java:267)
- org.glassfish.jersey.process.internal.RequestScope.runInScope(RequestScope.java:319)
- org.glassfish.jersey.server.ServerRuntime.process(ServerRuntime.java:236)
- org.glassfish.jersey.server.ApplicationHandler.handle(ApplicationHandler.java:1028)
- org.glassfish.jersey.servlet.WebComponent.service(WebComponent.java:373)
- org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:381)
- org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:344)
- org.glassfish.jersey.servlet.ServletContainer.service(ServletContainer.java:219)
- org.apache.tomcat.websocket.server.WsFilter.doFilter(WsFilter.java:52)
- org.apache.catalina.filters.CorsFilter.handleSimpleCORS(CorsFilter.java:303)
- org.apache.catalina.filters.CorsFilter.doFilter(CorsFilter.java:171)
-</pre></p><p><b>note</b> <u>The full stack trace of the root cause is available in the Apache Tomcat/7.0.61 logs.</u></p><HR size="1" noshade="noshade"><h3>Apache Tomcat/7.0.61</h3></body></html>
\ No newline at end of file
diff --git a/studentview/assets/js/deleteProject.js b/studentview/assets/js/deleteProject.js
index ab765e3fd878713b249236cd1a52be4ada02b3da..b429639c4f044f74c749a3d6c3c8d737bc218954 100644
--- a/studentview/assets/js/deleteProject.js
+++ b/studentview/assets/js/deleteProject.js
@@ -31,6 +31,7 @@ function deleteProject(projectName) {
Accept: "text/plain; charset=utf-8",
type: 'DELETE',
contentType: "text/plain",
+ async: false,
success: function (response) {
},
diff --git a/studentview/assets/js/overview.js b/studentview/assets/js/overview.js
index 9ac54f58b5ea9bea39982a6a4e5b1f23a25eb7fe..a66538baa5732073685e411e7eab5864e8d7cc51 100644
--- a/studentview/assets/js/overview.js
+++ b/studentview/assets/js/overview.js
@@ -40,8 +40,6 @@ function printProjects(projects, offset) {
}
function getProjectOverview(user) {
-
-
var url = compbaseUrl + "/api2/user/" + user + "/projects";
$.ajax({
url: url,
diff --git a/studentview/database/config.php b/studentview/database/config.php
index b350864e60320db20c45ac6a4dd024eaf2edec3d..78c43d8025c42128990909f7d2dd5b87d4776088 100644
--- a/studentview/database/config.php
+++ b/studentview/database/config.php
@@ -7,4 +7,4 @@
*/
//$db = mysqli_connect("localhost", "root2", "voyager2", "fltrail");
-$db = mysqli_connect("localhost", "root", "voyager", "fltrail");
+$db = mysqli_connect("localhost", "root", "", "fltrail");
diff --git a/studentview/pages/newproject.php b/studentview/pages/newproject.php
index d598b9fc3a3e634f1b6dff09accb90059e8aa98a..4e729cfb849affa61b45c686f90bd906efc656f3 100644
--- a/studentview/pages/newproject.php
+++ b/studentview/pages/newproject.php
@@ -54,25 +54,25 @@ include_once '../database/tokenSetter.php';
</div>
<div class="contact-clean">
<p>Name des Projekts</p>
- <div class="alert alert-danger" role="alert" id="projectNameExists">
+ <div class="alert alert-danger" role="alert" style="width:475px" id="projectNameExists">
Dieser Projektname exisitiert bereits.
</div>
- <div class="alert alert-danger" role="alert" id="exactNumberOfTags">
+ <div class="alert alert-danger" role="alert" style="width:475px" id="exactNumberOfTags">
Es müssen genau 5 Tags eingegeben werden.
</div>
- <div class="alert alert-danger" role="alert" id="specialChars">
+ <div class="alert alert-danger" role="alert" style="width:475px" id="specialChars">
Der Projektname darf keine Sonderzeichen enthalten.
</div>
- <div class="alert alert-danger" role="alert" id="projectIsMissing">
+ <div class="alert alert-danger" role="alert" style="width:475px" id="projectIsMissing">
Tragen sie einen Projektnamen ein.
</div>
- <div class="form-group"><input class="form-control" type="text" name="name" placeholder="Name"
+ <div class="form-group"><input class="form-control" name="name" placeholder="Name"
style="width:286px;margin-left:50px;" id="nameProject"></div>
<p> Passwort zum Teilnehmen (optional) </p>
- <div class="form-group"><input class="form-control" type="email" name="password" placeholder="Passwort"
+ <div class="form-group"><input class="form-control" name="password" placeholder="Passwort"
style="width:287px;margin-left:51px;" id="passwordProject"></div>
<p> Passwort zum Löschen (sonst: 1234) </p>
- <div class="form-group"><input class="form-control" type="email" name="adminpassword" placeholder="Passwort"
+ <div class="form-group"><input class="form-control" name="adminpassword" placeholder="Passwort"
style="width:287px;margin-left:51px;" id="adminPassword"></div>
<p>Tags </p>
<div id="tagHelper" class="alert alert-warning" style="width:475px;">
diff --git a/studentview/pages/preferences.php b/studentview/pages/preferences.php
index 30dd2ca3717670eb88daf84c1201f0a554b0e073..b3149bb22f4bff1f91d317ad0513a091c52c696f 100644
--- a/studentview/pages/preferences.php
+++ b/studentview/pages/preferences.php
@@ -105,7 +105,7 @@ $projectName = $resultObj->id;
<button class="btn btn-primary" id="studentFormSubmit" style="width:90px;margin-left:169px;margin-top:13px;">
eintragen
</button>
- <div class="alert alert-warning" role="alert">
+ <div class="alert alert-warning" style="width:520px" role="alert">
Das Verarbeiten der Lernziele und das Gruppenmatching kann einen Moment dauern!
</div>
</div>