From b1590d8314bbd8574d7c0bf449bc9d0ade5da645 Mon Sep 17 00:00:00 2001
From: Axel <wiepke@uni-potsdam.de>
Date: Tue, 6 Mar 2018 10:56:37 +0100
Subject: [PATCH] design and bug fix
warnings pop up instead of alerts,
missing emails are correctly displayed
---
studentview/.idea/workspace.xml | 240 ++++++++++------------
studentview/assets/js/Projekte.js | 102 +++++----
studentview/assets/js/myGroupsInit.js | 17 +-
studentview/assets/js/newProject.js | 8 +-
studentview/database/getProjectExists.php | 28 ---
studentview/database/getProjects.php | 15 +-
studentview/pages/MeineGruppen.php | 10 +-
studentview/pages/Projekte.php | 8 +-
studentview/register.html | 6 +-
9 files changed, 218 insertions(+), 216 deletions(-)
delete mode 100644 studentview/database/getProjectExists.php
diff --git a/studentview/.idea/workspace.xml b/studentview/.idea/workspace.xml
index 9866b7cd..69dad104 100644
--- a/studentview/.idea/workspace.xml
+++ b/studentview/.idea/workspace.xml
@@ -19,14 +19,14 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="375">
- <file leaf-file-name="Projekte.js" pinned="false" current-in-tab="false">
+ <file leaf-file-name="Projekte.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/assets/js/Projekte.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="798">
- <caret line="38" column="4" lean-forward="false" selection-start-line="38" selection-start-column="4" selection-end-line="60" selection-end-column="5" />
+ <state relative-caret-position="542">
+ <caret line="51" column="53" lean-forward="true" selection-start-line="51" selection-start-column="53" selection-end-line="51" selection-end-column="53" />
<folding>
- <marker date="1519985188897" expanded="true" signature="2790:2874" ph="..." />
- <marker date="1519985188897" expanded="true" signature="3895:3913" ph="..." />
+ <marker date="1520330056925" expanded="true" signature="3358:3442" ph="..." />
+ <marker date="1520330056925" expanded="true" signature="4481:4499" ph="..." />
</folding>
</state>
</provider>
@@ -35,8 +35,8 @@
<file leaf-file-name="Projekte.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/Projekte.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="987">
- <caret line="47" column="66" lean-forward="false" selection-start-line="47" selection-start-column="66" selection-end-line="47" selection-end-column="66" />
+ <state relative-caret-position="441">
+ <caret line="60" column="46" lean-forward="false" selection-start-line="60" selection-start-column="46" selection-end-line="60" selection-end-column="46" />
<folding />
</state>
</provider>
@@ -45,30 +45,18 @@
<file leaf-file-name="neuesProjekt.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/neuesProjekt.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1302">
- <caret line="62" column="78" lean-forward="false" selection-start-line="62" selection-start-column="62" selection-end-line="62" selection-end-column="78" />
+ <state relative-caret-position="765">
+ <caret line="60" column="54" lean-forward="true" selection-start-line="60" selection-start-column="54" selection-end-line="60" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
</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="903">
- <caret line="45" column="34" lean-forward="false" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
- <folding>
- <element signature="e#0#46#0" expanded="false" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
<file leaf-file-name="index.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="630">
- <caret line="30" column="14" lean-forward="false" selection-start-line="28" selection-start-column="22" selection-end-line="30" selection-end-column="14" />
+ <state relative-caret-position="882">
+ <caret line="42" column="7" lean-forward="true" selection-start-line="42" selection-start-column="7" selection-end-line="42" selection-end-column="7" />
<folding>
<marker date="1520244704674" expanded="true" signature="1376:1435" ph="..." />
</folding>
@@ -79,47 +67,43 @@
<file leaf-file-name="myGroupsInit.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/assets/js/myGroupsInit.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2226">
- <caret line="106" column="30" lean-forward="false" selection-start-line="106" selection-start-column="0" selection-end-line="107" selection-end-column="0" />
+ <state relative-caret-position="2247">
+ <caret line="107" column="54" lean-forward="true" selection-start-line="107" selection-start-column="54" selection-end-line="107" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="newProject.js" pinned="false" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/assets/js/newProject.js">
+ <file leaf-file-name="register.html" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/register.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="450">
- <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
- <folding>
- <element signature="e#0#46#0" expanded="false" />
- </folding>
+ <state relative-caret-position="336">
+ <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+ <folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="getProjectExists.php" pinned="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/database/getProjectExists.php">
+ <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="231">
- <caret line="16" column="25" lean-forward="false" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
+ <state relative-caret-position="420">
+ <caret line="25" column="0" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
<folding>
<element signature="e#6#91#0#PHP" expanded="false" />
- <marker date="1520255334097" expanded="true" signature="309:331" ph="SELECT * FRO... projects" />
- <marker date="1520255334097" expanded="true" signature="309:357" ph="SELECT * FRO... projects" />
+ <marker date="1520329188025" expanded="true" signature="398:446" ph="SELECT * FRO... projects" />
</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">
+ <file leaf-file-name="newProject.js" pinned="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/assets/js/newProject.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="189">
- <caret line="14" column="52" lean-forward="false" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
+ <state relative-caret-position="672">
+ <caret line="34" column="16" lean-forward="true" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
<folding>
- <element signature="e#6#91#0#PHP" expanded="false" />
- <marker date="1520251478972" expanded="true" signature="371:419" ph="SELECT * FRO... projects" />
+ <element signature="e#0#46#0" expanded="false" />
</folding>
</state>
</provider>
@@ -128,8 +112,8 @@
<file leaf-file-name="MeineGruppen.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/pages/MeineGruppen.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="882">
- <caret line="42" column="10" lean-forward="false" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
+ <state relative-caret-position="462">
+ <caret line="61" column="60" lean-forward="true" selection-start-line="61" selection-start-column="60" selection-end-line="61" selection-end-column="60" />
<folding />
</state>
</provider>
@@ -163,12 +147,16 @@
<find>show</find>
<find>studen</find>
<find>over</find>
- <find>tag</find>
<find>pages</find>
<find>get</find>
<find>projectT</find>
<find>die e</find>
<find>alert</find>
+ <find>tag</find>
+ <find>falsc</find>
+ <find>$('projectIsMissing').</find>
+ <find>project e</find>
+ <find>projectWrongPassword</find>
</findStrings>
</component>
<component name="GradleLocalSettings">
@@ -195,7 +183,6 @@
<option value="$PROJECT_DIR$/pages/MeineGruppen.html" />
<option value="$PROJECT_DIR$/index.html" />
<option value="$PROJECT_DIR$/pages/Projekte.html" />
- <option value="$PROJECT_DIR$/register.html" />
<option value="$PROJECT_DIR$/database/config.php" />
<option value="$PROJECT_DIR$/pages/getTags.php" />
<option value="$PROJECT_DIR$/database/tokenSetter.php" />
@@ -203,18 +190,19 @@
<option value="$PROJECT_DIR$/database/getTags.php" />
<option value="$PROJECT_DIR$/database/putProject.php" />
<option value="$PROJECT_DIR$/database/putTags.php" />
- <option value="$PROJECT_DIR$/assets/js/Projekte.js" />
- <option value="$PROJECT_DIR$/assets/js/myGroupsInit.js" />
<option value="$PROJECT_DIR$/database/getAdresses.php" />
<option value="$PROJECT_DIR$/assets/js/overview.js" />
<option value="$PROJECT_DIR$/pages/overview.php" />
- <option value="$PROJECT_DIR$/pages/MeineGruppen.php" />
- <option value="$PROJECT_DIR$/pages/Projekte.php" />
<option value="$PROJECT_DIR$/index.php" />
- <option value="$PROJECT_DIR$/database/getProjects.php" />
<option value="$PROJECT_DIR$/pages/neuesProjekt.php" />
<option value="$PROJECT_DIR$/database/getProjectExists.php" />
+ <option value="$PROJECT_DIR$/register.html" />
+ <option value="$PROJECT_DIR$/assets/js/myGroupsInit.js" />
+ <option value="$PROJECT_DIR$/pages/MeineGruppen.php" />
+ <option value="$PROJECT_DIR$/database/getProjects.php" />
<option value="$PROJECT_DIR$/assets/js/newProject.js" />
+ <option value="$PROJECT_DIR$/pages/Projekte.php" />
+ <option value="$PROJECT_DIR$/assets/js/Projekte.js" />
</list>
</option>
</component>
@@ -488,12 +476,12 @@
<workItem from="1519891911695" duration="7508000" />
<workItem from="1519980697735" duration="11562000" />
<workItem from="1520232412925" duration="22197000" />
- <workItem from="1520321988715" duration="967000" />
+ <workItem from="1520321988715" duration="7355000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
- <option name="totallyTimeSpent" value="108168000" />
+ <option name="totallyTimeSpent" value="114556000" />
</component>
<component name="ToolWindowManager">
<frame x="-359" y="-1449" width="2578" height="1458" extended-state="6" />
@@ -501,8 +489,9 @@
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.19765624" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
- <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" 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.32955405" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32955405" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="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" />
@@ -526,7 +515,6 @@
<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.32955405" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -561,8 +549,8 @@
<state relative-caret-position="0">
<caret line="8" column="58" lean-forward="false" selection-start-line="8" selection-start-column="58" selection-end-line="8" selection-end-column="58" />
<folding>
- <marker date="1519985188897" expanded="true" signature="2790:2874" ph="..." />
- <marker date="1519985188897" expanded="true" signature="3895:3913" ph="..." />
+ <marker date="1520330056925" expanded="true" signature="3358:3442" ph="..." />
+ <marker date="1520330056925" expanded="true" signature="4481:4499" ph="..." />
</folding>
</state>
</provider>
@@ -620,8 +608,8 @@
<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="1519985188897" expanded="true" signature="2790:2874" ph="..." />
- <marker date="1519985188897" expanded="true" signature="3895:3913" ph="..." />
+ <marker date="1520330056925" expanded="true" signature="3358:3442" ph="..." />
+ <marker date="1520330056925" expanded="true" signature="4481:4499" ph="..." />
</folding>
</state>
</provider>
@@ -706,16 +694,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/database/userExists.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="25" selection-end-column="6" />
- <folding>
- <marker date="1519639800374" expanded="true" signature="219:314" ph="SELECT (u.to... users" />
- </folding>
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/database/tokenSetter.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="126">
@@ -748,21 +726,6 @@
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/register.html">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="546">
- <caret line="26" column="104" lean-forward="false" selection-start-line="26" selection-start-column="104" selection-end-line="26" selection-end-column="104" />
- </state>
- </provider>
- </entry>
- <entry file="file://$PROJECT_DIR$/database/config.php">
- <provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="63">
- <caret line="8" column="5" lean-forward="true" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="6" />
- <folding />
- </state>
- </provider>
- </entry>
<entry file="file://$PROJECT_DIR$/database/putTagsAndPW.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
@@ -811,6 +774,7 @@
<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>
@@ -818,6 +782,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="1" lean-forward="false" selection-start-line="0" selection-start-column="1" selection-end-line="0" selection-end-column="1" />
+ <folding />
</state>
</provider>
</entry>
@@ -825,101 +790,124 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="4158">
<caret line="204" column="36" lean-forward="true" selection-start-line="204" selection-start-column="36" selection-end-line="204" selection-end-column="36" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/index.php">
+ <entry file="file://$PROJECT_DIR$/assets/js/overview.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="630">
- <caret line="30" column="14" lean-forward="false" selection-start-line="28" selection-start-column="22" selection-end-line="30" selection-end-column="14" />
+ <state relative-caret-position="903">
+ <caret line="45" column="34" lean-forward="false" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
<folding>
- <marker date="1520244704674" expanded="true" signature="1376:1435" ph="..." />
+ <element signature="e#0#46#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pages/MeineGruppen.php">
+ <entry file="file://$PROJECT_DIR$/database/userExists.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="882">
- <caret line="42" column="10" lean-forward="false" selection-start-line="42" selection-start-column="10" selection-end-line="42" selection-end-column="10" />
- <folding />
+ <state relative-caret-position="420">
+ <caret line="25" column="6" lean-forward="true" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" />
+ <folding>
+ <marker date="1519639800374" expanded="true" signature="219:314" ph="SELECT (u.to... users" />
+ </folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/assets/js/myGroupsInit.js">
+ <entry file="file://$PROJECT_DIR$/database/config.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="2226">
- <caret line="106" column="30" lean-forward="false" selection-start-line="106" selection-start-column="0" selection-end-line="107" selection-end-column="0" />
+ <state relative-caret-position="63">
+ <caret line="8" column="5" lean-forward="true" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pages/Projekte.php">
+ <entry file="file://$PROJECT_DIR$/register.html">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="987">
- <caret line="47" column="66" lean-forward="false" selection-start-line="47" selection-start-column="66" selection-end-line="47" selection-end-column="66" />
+ <state relative-caret-position="336">
+ <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/assets/js/Projekte.js">
+ <entry file="file://$PROJECT_DIR$/index.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="798">
- <caret line="38" column="4" lean-forward="false" selection-start-line="38" selection-start-column="4" selection-end-line="60" selection-end-column="5" />
+ <state relative-caret-position="882">
+ <caret line="42" column="7" lean-forward="true" selection-start-line="42" selection-start-column="7" selection-end-line="42" selection-end-column="7" />
<folding>
- <marker date="1519985188897" expanded="true" signature="2790:2874" ph="..." />
- <marker date="1519985188897" expanded="true" signature="3895:3913" ph="..." />
+ <marker date="1520244704674" expanded="true" signature="1376:1435" ph="..." />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/database/getProjects.php">
+ <entry file="file://$PROJECT_DIR$/assets/js/myGroupsInit.js">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="189">
- <caret line="14" column="52" lean-forward="false" selection-start-line="14" selection-start-column="52" selection-end-line="14" selection-end-column="52" />
- <folding>
- <element signature="e#6#91#0#PHP" expanded="false" />
- <marker date="1520251478972" expanded="true" signature="371:419" ph="SELECT * FRO... projects" />
- </folding>
+ <state relative-caret-position="2247">
+ <caret line="107" column="54" lean-forward="true" selection-start-line="107" selection-start-column="54" selection-end-line="107" selection-end-column="54" />
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/pages/neuesProjekt.php">
+ <entry file="file://$PROJECT_DIR$/pages/MeineGruppen.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="1302">
- <caret line="62" column="78" lean-forward="false" selection-start-line="62" selection-start-column="62" selection-end-line="62" selection-end-column="78" />
+ <state relative-caret-position="462">
+ <caret line="61" column="60" lean-forward="true" selection-start-line="61" selection-start-column="60" selection-end-line="61" selection-end-column="60" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/database/getProjectExists.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="231">
- <caret line="16" column="25" lean-forward="false" selection-start-line="16" selection-start-column="25" selection-end-line="16" selection-end-column="25" />
+ <state relative-caret-position="63">
+ <caret line="8" column="0" lean-forward="true" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/database/getProjects.php">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="420">
+ <caret line="25" column="0" lean-forward="false" selection-start-line="25" selection-start-column="0" selection-end-line="25" selection-end-column="0" />
<folding>
<element signature="e#6#91#0#PHP" expanded="false" />
- <marker date="1520255334097" expanded="true" signature="309:331" ph="SELECT * FRO... projects" />
- <marker date="1520255334097" expanded="true" signature="309:357" ph="SELECT * FRO... projects" />
+ <marker date="1520329188025" expanded="true" signature="398:446" ph="SELECT * FRO... projects" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/assets/js/overview.js">
+ <entry file="file://$PROJECT_DIR$/pages/neuesProjekt.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="903">
- <caret line="45" column="34" lean-forward="false" selection-start-line="45" selection-start-column="34" selection-end-line="45" selection-end-column="34" />
+ <state relative-caret-position="765">
+ <caret line="60" column="54" lean-forward="true" selection-start-line="60" selection-start-column="54" selection-end-line="60" selection-end-column="54" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/assets/js/newProject.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="672">
+ <caret line="34" column="16" lean-forward="true" selection-start-line="34" selection-start-column="16" selection-end-line="34" selection-end-column="16" />
<folding>
<element signature="e#0#46#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/assets/js/newProject.js">
+ <entry file="file://$PROJECT_DIR$/pages/Projekte.php">
<provider selected="true" editor-type-id="text-editor">
- <state relative-caret-position="450">
- <caret line="64" column="34" lean-forward="true" selection-start-line="64" selection-start-column="34" selection-end-line="64" selection-end-column="34" />
+ <state relative-caret-position="441">
+ <caret line="60" column="46" lean-forward="false" selection-start-line="60" selection-start-column="46" selection-end-line="60" selection-end-column="46" />
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ <entry file="file://$PROJECT_DIR$/assets/js/Projekte.js">
+ <provider selected="true" editor-type-id="text-editor">
+ <state relative-caret-position="542">
+ <caret line="51" column="53" lean-forward="true" selection-start-line="51" selection-start-column="53" selection-end-line="51" selection-end-column="53" />
<folding>
- <element signature="e#0#46#0" expanded="false" />
+ <marker date="1520330056925" expanded="true" signature="3358:3442" ph="..." />
+ <marker date="1520330056925" expanded="true" signature="4481:4499" ph="..." />
</folding>
</state>
</provider>
diff --git a/studentview/assets/js/Projekte.js b/studentview/assets/js/Projekte.js
index ca8df476..c3e7f202 100644
--- a/studentview/assets/js/Projekte.js
+++ b/studentview/assets/js/Projekte.js
@@ -2,6 +2,8 @@
* Created by fides-WHK on 09.01.2018.
*/
$(document).ready(function () {
+ $("#projectWrongPassword").hide();
+ $("#projectIsMissing").hide();
$("#toggleArea").toggle();
$("#studentFormSubmit").on("click", function () {
@@ -10,48 +12,57 @@ $(document).ready(function () {
$("#addCompetenceButton").on("click", function () {
addInput("competencies"); //creates a new input-Field with the ID 'competenciesX' where X is number of elements with 'competencies' as ID
});
- $("#subtractCompetenceButton").on("click",function() {
+ $("#subtractCompetenceButton").on("click", function () {
deletInput("competencies"); //deletes latest input-Field with the ID 'competenciesX' where X is number of elements with 'competencies' as ID
});
$("#addResearchQuestionButton").on("click", function () {
addInput("researchQuestion"); //creates a new input-Field with the ID 'researchQuestionX' where X is number of elements with 'researchQuestion' as ID
});
- $("#subtractCResearchQuestionButton").on("click",function() {
+ $("#subtractCResearchQuestionButton").on("click", function () {
deletInput("researchQuestion"); //deletes the latest input-Field with ID 'researchQuestionX' where X is number of elements with 'researchQuestion' as ID
});
- $("#projectName").keypress(function(e){
- if (e.which == 13){
+ $("#projectName").keypress(function (e) {
+ if (e.which == 13) {
getTags();
document.getElementById("projectPassword").focus();
}
});
- $("#projectPassword").keypress(function(e){
- if (e.which == 13){
+ $("#projectPassword").keypress(function (e) {
+ if (e.which == 13) {
+ seeProject($('#projectName').val());
document.getElementById("competencies0").focus();
}
});
- $("#seeProject").on('click', function (){
+ $("#seeProject").on('click', function () {
seeProject($('#projectName').val());
});
});
-function seeProject(projectName){
- var url = "../database/getProjects.php?project="+projectName+"&password="+document.getElementById('projectPassword').value;
- if (projectName===""){
+function seeProject(projectName) {
+ var url = "../database/getProjects.php?project=" + projectName + "&password=" + document.getElementById('projectPassword').value;
+ if (projectName === "") {
return false;
- }else{
+ } else {
$.ajax({
url: url,
projectName: projectName,
Accept: "text/plain; charset=utf-8",
contentType: "text/plain",
success: function (response) {
- if (response === "true"){
+ if (response === "project missing") {
+ $("#projectIsMissing").show();
getTags(projectName);
- $("#toggleArea").toggle();
- $("#seeProject").hide();
- }else{
- alert("falsches Passwort");
+ } else {
+ if (response === "correct password") {
+ $("#projectIsMissing").hide();
+ getTags(projectName);
+ $("#toggleArea").toggle();
+ $("#seeProject").hide();
+ $('#projectWrongPassword').hide();
+ } else {
+ $("#projectIsMissing").hide();
+ $('#projectWrongPassword').show();
+ }
}
},
error: function (a, b, c) {
@@ -61,28 +72,28 @@ function seeProject(projectName){
}
}
-function addInput(name){ //creates a new input-Field with the ID 'nameX' where X is number of elements with 'name' as ID
+function addInput(name) { //creates a new input-Field with the ID 'nameX' where X is number of elements with 'name' as ID
var i = document.getElementsByName(name).length;
- var newInput=document.createElement("span");
+ var newInput = document.createElement("span");
newInput.innerHTML = "<input class='form-control' " +
"type='text' " +
- "name='"+name+"' " +
- "id='"+name+i+"' " +
+ "name='" + name + "' " +
+ "id='" + name + i + "' " +
"style='max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;'>";
var div = document.getElementById(name);
div.appendChild(newInput);
}
-function deletInput(name){ //deletes latest input-Field with the ID 'nameX' where X is number of elements with 'name' as ID
+function deletInput(name) { //deletes latest input-Field with the ID 'nameX' where X is number of elements with 'name' as ID
var i = document.getElementsByName(name).length;
- if (i>1){
- var lastEntry = document.getElementById(name+""+(i-1));
+ if (i > 1) {
+ var lastEntry = document.getElementById(name + "" + (i - 1));
lastEntry.parentNode.removeChild(lastEntry);
}
}
-function getTags(projectName){
- var url = "../database/getTags.php?project="+projectName;
+function getTags(projectName) {
+ var url = "../database/getTags.php?project=" + projectName;
$.ajax({
url: url,
Accept: "text/plain; charset=utf-8",
@@ -91,9 +102,9 @@ function getTags(projectName){
response = JSON.parse(response);
var tagList = [];
var i = 0;
- for (i = 0 ; i < response.length; i++)
- tagList.push(response[i].tag);
- for (i=0 ; i< tagList.length; i++) {
+ for (i = 0; i < response.length; i++)
+ 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' " +
@@ -111,12 +122,12 @@ function getTags(projectName){
}
function takesPartInProject(userID, projectID) {
- document.getElementById('loader').className="loader";
- document.getElementById('wrapper').className="wrapper inactive";
+ document.getElementById('loader').className = "loader";
+ document.getElementById('wrapper').className = "wrapper inactive";
- var allTheTags=[];
- var url = "https://esb.uni-potsdam.de:8243/services/competenceBase/api2/user/"+userID+"/projects/"+projectID+"/preferences";
- var allTheCompetencies =[];
+ var allTheTags = [];
+ var url = "https://esb.uni-potsdam.de:8243/services/competenceBase/api2/user/" + userID + "/projects/" + projectID + "/preferences";
+ var allTheCompetencies = [];
var allTheResearchQuestions = [];
for (i = 0; i < document.getElementsByName("competencies").length; i++) { //goes through all competencies and adds them to allTheCompetencies
allTheCompetencies.push(document.getElementsByName("competencies")[i].value);
@@ -125,15 +136,22 @@ function takesPartInProject(userID, projectID) {
allTheResearchQuestions.push(document.getElementsByName("researchQuestions")[i].value);
}
for (i = 0; i < document.getElementsByName("tag").length; i++) { //goes through all tags and adds them to allTheTags
- if (document.getElementById("tag"+i).checked === true){
- allTheTags.push(document.getElementById("tag"+i).value);
+ if (document.getElementById("tag" + i).checked === true) {
+ allTheTags.push(document.getElementById("tag" + i).value);
}
- allTheCompetencies.push("Die Studierenden interessieren sich für "+document.getElementById("tag"+i).value); //todo: Die Tags werden hinter der Schnittstelle noch nicht verwertet, daher diese schnelle Lösung
- if (allTheTags.length > 2){
+ allTheCompetencies.push("Die Studierenden interessieren sich für " + document.getElementById("tag" + i).value); //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');
- allTheTags=[];
- document.getElementById('loader').className="loader inactive";
- document.getElementById('wrapper').className="wrapper";
+ 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');
+ allTheTags = [];
+ document.getElementById('loader').className = "loader inactive";
+ document.getElementById('wrapper').className = "wrapper";
return false;
}
}
@@ -151,8 +169,8 @@ function takesPartInProject(userID, projectID) {
data: dataString,
success: function (response) {
console.log(response);
- document.getElementById('loader').className="loader inactive";
- document.getElementById('wrapper').className="wrapper";
+ document.getElementById('loader').className = "loader inactive";
+ document.getElementById('wrapper').className = "wrapper";
},
error: function (a, b, c) {
diff --git a/studentview/assets/js/myGroupsInit.js b/studentview/assets/js/myGroupsInit.js
index 042bf06e..c89861cc 100644
--- a/studentview/assets/js/myGroupsInit.js
+++ b/studentview/assets/js/myGroupsInit.js
@@ -37,14 +37,14 @@ function getProjects(user) {
}
-function getMembers(project, user) {
+function getMembers(project, user) { //gets all Members in the chosen Project user is a part of with email adresses
var url = "https://esb.uni-potsdam.de:8243/services/competenceBase/api2/groups/" + project; //this API is used, since fleckenroller has security issues with CORS and stuff
$.ajax({
url: url,
user: user,
type: 'GET',
contentType: "application/json",
- dataType: "json",
+ dataType: "json", //{groups: [id, users:[]] }
success: function (data) {
for (var i = 0; i < data.groups.length; i++) {
for (var j = 0; j < data.groups[i].users.length; j++) {
@@ -53,14 +53,18 @@ function getMembers(project, user) {
$("#student3").show();
var student1 = data.groups[i].users[(j + 1) % data.groups[i].users.length];
var student2 = data.groups[i].users[(j + 2) % data.groups[i].users.length];
+ $("#student2").text(student1 + " keine E-Mail Adresse gefunden"); //if there is no email in the DB, you can just see the name
+ $("#student3").text(student2 + " keine E-Mail Adresse gefunden");
if (data.groups[i].users.length > 3) { //the fourth student is just shown if the group has at least 4 members
var student3 = data.groups[i].users[(j + 3) % data.groups[i].users.length];
+ $("#student4").text(student3 + " keine E-Mail Adresse gefunden");
}
if (data.groups[i].users.length > 4) { //the fifth student is just shown if the group has 5 members
var student4 = data.groups[i].users[(j + 4) % data.groups[i].users.length];
+ $("#student5").text(student4 + " keine E-Mail Adresse gefunden");
}
var innerurl = "../database/getAdresses.php?student1=" + student1 + "&student2=" + student2 + "&student3=" + student3 + "&student4=" + student4 + "&student5=";
- $.ajax({
+ $.ajax({ //get email adresses in this ajax.
student1: "" + student1,
student2: "" + student2,
student3: "" + student3,
@@ -96,6 +100,13 @@ function getMembers(project, user) {
}
}
}
+ },
+ error: function (a,b,c){
+ console.log(a);
+ $("#student2").hide();
+ $("#student3").hide();
+ $("#student4").hide();
+ $("#student5").hide();
}
});
}
diff --git a/studentview/assets/js/newProject.js b/studentview/assets/js/newProject.js
index d5e1bc65..58e93739 100644
--- a/studentview/assets/js/newProject.js
+++ b/studentview/assets/js/newProject.js
@@ -26,7 +26,7 @@ $(document).ready(function () {
});
function courseExists(projectName) {
- var localurl = "../database/getProjectExists.php?project=" + projectName;
+ var localurl = "../database/getProjects.php?project=" + projectName;
if (projectName === "") {
$('#projectIsMissing').show();
return false;
@@ -38,7 +38,7 @@ function courseExists(projectName) {
Accept: "text/plain; charset=utf-8",
contentType: "text/plain",
success: function (response) {
- if (response === "true") {
+ if (response !== "project missing") {
$('#projectNameExists').show();
if (allTheTags.length !== 5) {
document.getElementById('tagHelper').className = "alert alert-warning";
@@ -61,7 +61,7 @@ function courseExists(projectName) {
function createNewProject(allTheTags, activ) {
projectName = $("#nameProject").val();
password = $("#passwordProject").val();
- var localurl = "../database/getProjectExists.php?project=" + projectName;
+ var localurl = "../database/getProjects.php?project=" + projectName;
if (allTheTags.length !== 5) {
document.getElementById('tagHelper').className = "alert alert-warning";
} else {
@@ -78,7 +78,7 @@ function createNewProject(allTheTags, activ) {
Accept: "text/plain; charset=utf-8",
contentType: "text/plain",
success: function (response) {
- if (response === "true") {
+ if (response !== "project missing") {
$('#projectNameExists').show();
return true;
} else {
diff --git a/studentview/database/getProjectExists.php b/studentview/database/getProjectExists.php
deleted file mode 100644
index 1176a668..00000000
--- a/studentview/database/getProjectExists.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: fides-WHK
- * Date: 26.02.2018
- * Time: 10:09
- */
-include_once 'config.php';
-
-if (isset($_GET['project'])){
- $project = $_GET['project'];
- if (!$db) {
- die('Could not connect: ' . mysqli_error($db));
- }
-
- mysqli_select_db($db,"fltrail");
- $sql="SELECT * FROM projects WHERE id = '".$project."'";
- $result = mysqli_query($db,$sql);
-
- $row = mysqli_fetch_array($result);
- if (count($row) >= 1){
- echo 'true';
- }else {
- echo 'false';
- }
- mysqli_close($db);
-}
-?>
\ No newline at end of file
diff --git a/studentview/database/getProjects.php b/studentview/database/getProjects.php
index 2a68393b..8b13771a 100644
--- a/studentview/database/getProjects.php
+++ b/studentview/database/getProjects.php
@@ -7,9 +7,12 @@
*/
include_once 'config.php';
-if (isset($_GET['project'])&&isset($_GET['password'])){
+if (isset($_GET['project'])){
$project = $_GET['project'];
+if(isset($_GET['password'])){
$password = $_GET['password'];
+}else $password = "";
+
if (!$db) {
die('Could not connect: ' . mysqli_error($db));
@@ -20,10 +23,14 @@ if (isset($_GET['project'])&&isset($_GET['password'])){
$result = mysqli_query($db,$sql);
$row = mysqli_fetch_array($result);
- if ($row['password'] === $password){
- echo 'true';
+ if (count($row) < 1){
+ echo 'project missing';
}else {
- echo 'false';
+ if ($row['password'] === $password) {
+ echo 'correct password';
+ } else {
+ echo 'wrong password';
+ }
}
mysqli_close($db);
}
diff --git a/studentview/pages/MeineGruppen.php b/studentview/pages/MeineGruppen.php
index 7b943765..0c4b327c 100644
--- a/studentview/pages/MeineGruppen.php
+++ b/studentview/pages/MeineGruppen.php
@@ -58,7 +58,7 @@ include_once '../database/tokenSetter.php';
<div class="col-md-offset-3 col-sm-8 col-xs-1">
<h3>Projekt:</h3>
<div class="dropdown">
- <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" id="projectDropdown">default Button
+ <button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown" id="projectDropdown">deine Projekte
<span class="caret"></span></button>
<ul class="dropdown-menu" id="dropdownOptions">
<!--
@@ -71,22 +71,22 @@ include_once '../database/tokenSetter.php';
</div>
</div>
<div class="row">
- <div><strong id="student2">Student 2 student@uni-da.de</strong></div>
+ <div><strong id="student2"></strong></div>
<div class="col-md-4" style="width:485px;">
</div>
</div>
<div class="row">
- <div><strong id="student3">Student 3</strong></div>
+ <div><strong id="student3"></strong></div>
<div class="col-md-4" style="width:485px;">
</div>
</div>
<div class="row">
- <div><strong id="student4">Student 4</strong></div>
+ <div><strong id="student4"></strong></div>
<div class="col-md-4" style="width:485px;">
</div>
</div>
<div class="row">
- <div><strong id="student5">Student 5</strong></div>
+ <div><strong id="student5"></strong></div>
<div class="col-md-4" style="width:485px;">
</div>
</div>
diff --git a/studentview/pages/Projekte.php b/studentview/pages/Projekte.php
index 3ad50afc..1ab44977 100644
--- a/studentview/pages/Projekte.php
+++ b/studentview/pages/Projekte.php
@@ -57,6 +57,9 @@ include_once '../database/tokenSetter.php';
<input class="form-control" type="text" id="projectName" name="Project" required=""
placeholder="Projekt1" autofocus=""
style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
+ <div class="alert alert-warning" role="alert" id="projectIsMissing">
+ Dieser Projektname existiert nicht.
+ </div>
</fieldset>
<fieldset>
@@ -64,8 +67,11 @@ include_once '../database/tokenSetter.php';
<input class="form-control" type="password" id="projectPassword" name="Password" required=""
placeholder="******"
style="margin:0px;max-width:417px;margin-left:14px;padding-top:10px;margin-top:2px;margin-bottom:13px;">
+ <div class="alert alert-warning" role="alert" id="projectWrongPassword">
+ Falsches Passwort.
+ </div>
</fieldset>
- <button id="seeProject">Einsehen</button>
+ <button id="seeProject" class="btn btn-primary">Einsehen</button>
<div id="toggleArea">
<fieldset>
<legend style="margin-left:13px;">Lernziele</legend>
diff --git a/studentview/register.html b/studentview/register.html
index 26d2ae7f..9a40b6cf 100644
--- a/studentview/register.html
+++ b/studentview/register.html
@@ -12,6 +12,9 @@
<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">
+ <script src="assets/js/jquery.min.js"></script>
+ <script src="assets/bootstrap/js/bootstrap.min.js"></script>
+
</head>
<body>
@@ -27,9 +30,6 @@
<div class="form-group"><button class="btn btn-primary btn-block" type="submit">Registrieren</button></div>
<a href="index.php" class="forgot">einloggen</a></form>
</div>
- <script src="assets/js/jquery.min.js"></script>
- <script src="assets/bootstrap/js/bootstrap.min.js"></script>
- <script src="assets/js/Sidebar-Menu.js"></script>
</body>
</html>
\ No newline at end of file
--
GitLab