diff --git a/.idea/Projet-web-2016-SAHA.iml b/.idea/Projet-web-2016-SAHA.iml new file mode 100644 index 0000000000000000000000000000000000000000..c956989b29ad0767edc6cf3a202545927c3d1e76 --- /dev/null +++ b/.idea/Projet-web-2016-SAHA.iml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="WEB_MODULE" version="4"> + <component name="NewModuleRootManager"> + <content url="file://$MODULE_DIR$" /> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000000000000000000000000000000000000..e7bedf3377d40335424fd605124d4761390218bb --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ +<component name="CopyrightManager"> + <settings default="" /> +</component> \ No newline at end of file diff --git a/.idea/deployment.xml b/.idea/deployment.xml index 3115f3f092708c4412e4b11171f1016d1eebd10a..89a12505194d5003a476128d30377f55968c2437 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="PublishConfigData" serverName="ProjetWebSAHA"> + <component name="PublishConfigData" serverName="proj_web"> <serverData> - <paths name="ProjetWebSAHA"> + <paths name="proj_web"> <serverdata> <mappings> <mapping deploy="/" local="$PROJECT_DIR$" web="/" /> + <mapping deploy="/" local="/var/www/html/Projet-web-2016-SAHA" web="/" /> </mappings> </serverdata> </paths> diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000000000000000000000000000000000000..d3f892590a189f52ad07de34d4225b03055d00aa --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ProjectModuleManager"> + <modules> + <module fileurl="file://$PROJECT_DIR$/.idea/Projet-web-2016-SAHA.iml" filepath="$PROJECT_DIR$/.idea/Projet-web-2016-SAHA.iml" /> + </modules> + </component> +</project> \ No newline at end of file diff --git a/.idea/sqlDataSources.xml b/.idea/sqlDataSources.xml index baa00fee2a508bec92460441cbd9dbbe9f94f7e0..c0c14130364473e0cee9213d663cc9f6f8009492 100644 --- a/.idea/sqlDataSources.xml +++ b/.idea/sqlDataSources.xml @@ -13,12 +13,28 @@ </option> </State> <State> - <option name="id" value="e3987d78-a391-4fb0-bfaa-139908e6b0b3" /> - <option name="name" value="DDL data source" /> + <option name="id" value="b3e54fb2-6e47-4b60-9e5e-174eaea27ef8" /> + <option name="name" value="DDL data source 2" /> <option name="urls"> <array> <option value="file://$PROJECT_DIR$/Code/BD/fill_assoc.sql" /> + </array> + </option> + </State> + <State> + <option name="id" value="042e722a-9429-48e3-bdf6-fecf0cb84879" /> + <option name="name" value="DDL data source 3" /> + <option name="urls"> + <array> <option value="file://$PROJECT_DIR$/Code/BD/fill_assoc_eleve.sql" /> + </array> + </option> + </State> + <State> + <option name="id" value="8edadab5-ed24-4fb7-9f59-f11431a76563" /> + <option name="name" value="DDL data source 4" /> + <option name="urls"> + <array> <option value="file://$PROJECT_DIR$/Code/BD/fill_eleve.sql" /> </array> </option> diff --git a/.idea/webServers.xml b/.idea/webServers.xml index 2ffe06e0a6f2fa84e12c27cecf003e37fe4b6e10..056bd49f4a9843e4f9385bc1ca5811f4cc9022ba 100644 --- a/.idea/webServers.xml +++ b/.idea/webServers.xml @@ -2,8 +2,8 @@ <project version="4"> <component name="WebServers"> <option name="servers"> - <webServer id="eb75e46f-7761-4b10-9544-ec9a0f456eea" name="ProjetWebSAHA" url="http://localhost"> - <fileTransfer port="0" mountedRoot="$PROJECT_DIR$" accessType="MOUNT" /> + <webServer id="eb75e46f-7761-4b10-9544-ec9a0f456eea" name="proj_web" url="http://proj_web.com"> + <fileTransfer port="0" mountedRoot="/var/www/html/Projet-web-2016-SAHA" accessType="MOUNT" /> </webServer> </option> </component> diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000000000000000000000000000000000000..09e79ca0f617724589593782ede0c65cd265fab5 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,790 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="ChangeListManager"> + <list default="true" id="a90e8976-6931-4e0c-8a88-bbfbe5c0b6dd" name="Default" comment=""> + <change type="DELETED" beforePath="$PROJECT_DIR$/Code/Exemples de code/JS Form and authentification.odt" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/Code/Exemples de code/ex_cerulean.html" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/Code/Exemples de code/fill_eleve.csv" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/Code/Exemples de code/fill_eleve.sql" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/Code/profil_vision.php" afterPath="" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/deployment.xml" afterPath="$PROJECT_DIR$/.idea/deployment.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/sqlDataSources.xml" afterPath="$PROJECT_DIR$/.idea/sqlDataSources.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/webServers.xml" afterPath="$PROJECT_DIR$/.idea/webServers.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/BD/create_eleve.sql" afterPath="$PROJECT_DIR$/Code/BD/create_eleve.sql" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/BD/fill_assoc_eleve.csv" afterPath="$PROJECT_DIR$/Code/BD/fill_assoc_eleve.csv" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/checkForm.js" afterPath="$PROJECT_DIR$/Code/checkForm.js" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/config.php" afterPath="$PROJECT_DIR$/Code/config.php" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/config_s.php" afterPath="$PROJECT_DIR$/Code/config_s.php" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/creation_donnees_perso.php" afterPath="$PROJECT_DIR$/Code/creation_donnees_perso.php" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/creer_profil1.php" afterPath="$PROJECT_DIR$/Code/creer_profil1.php" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/style.css" afterPath="$PROJECT_DIR$/Code/style.css" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/style_form.css" afterPath="$PROJECT_DIR$/Code/style_form.css" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Code/style_mail.css" afterPath="$PROJECT_DIR$/Code/style_mail.css" /> + </list> + <ignored path="Projet-web-2016-SAHA.iws" /> + <ignored path=".idea/workspace.xml" /> + <ignored path=".idea/dataSources.local.xml" /> + <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> + <option name="TRACKING_ENABLED" value="true" /> + <option name="SHOW_DIALOG" value="false" /> + <option name="HIGHLIGHT_CONFLICTS" value="true" /> + <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> + <component name="DatabaseView"> + <option name="GROUP_SCHEMA" value="true" /> + <option name="GROUP_CONTENTS" value="false" /> + <option name="SORT_POSITIONED" value="false" /> + <option name="SHOW_TABLE_DETAILS" value="true" /> + <option name="SHOW_EMPTY_GROUPS" value="false" /> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" /> + <option name="myItemType" value="com.intellij.database.view.DatabaseStructure$Root" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" /> + <option name="myItemType" value="com.intellij.database.view.DatabaseStructure$Root" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="DDL data source" /> + <option name="myItemType" value="com.intellij.database.view.DbNodeDescriptor" /> + </PATH_ELEMENT> + </PATH> + </component> + <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> + <component name="FavoritesManager"> + <favorites_list name="Projet-web-2016-SAHA" /> + </component> + <component name="FileEditorManager"> + <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> + <file leaf-file-name="checkForm.js" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Code/checkForm.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="763"> + <caret line="130" column="5" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" /> + <folding> + <element signature="n#!!doc;n#validateForm1#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="profil_modif.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Code/profil_modif.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="570"> + <caret line="68" column="33" selection-start-line="68" selection-start-column="33" selection-end-line="68" selection-end-column="33" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="creer_profil1.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Code/creer_profil1.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="105"> + <caret line="12" column="50" selection-start-line="12" selection-start-column="50" selection-end-line="12" selection-end-column="50" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="creation_donnees_perso.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Code/creation_donnees_perso.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="178"> + <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" /> + <folding> + <element signature="e#6#85#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="add_lien.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Code/add_lien.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="16" column="46" selection-start-line="16" selection-start-column="46" selection-end-line="16" selection-end-column="46" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ajout_lien.php" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/Code/ajout_lien.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="create_eleve.sql" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Code/BD/create_eleve.sql"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="315"> + <caret line="21" column="32" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="creer_profil2.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Code/creer_profil2.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="420"> + <caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> + <folding> + <element signature="e#6#85#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="accueil.php" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/Code/accueil.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-881"> + <caret line="9" column="7" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="7" /> + <folding /> + </state> + </provider> + </entry> + </file> + </leaf> + </component> + <component name="FileTemplateManagerImpl"> + <option name="RECENT_TEMPLATES"> + <list> + <option value="JavaScript File" /> + <option value="HTML File" /> + </list> + </option> + </component> + <component name="Git.Settings"> + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> + </component> + <component name="IdeDocumentHistory"> + <option name="CHANGED_PATHS"> + <list> + <option value="$PROJECT_DIR$/Code/mise_en_page2.php" /> + <option value="$PROJECT_DIR$/Code/creer_profil.php" /> + <option value="$PROJECT_DIR$/Code/accueil2.php" /> + <option value="$PROJECT_DIR$/Code/modification_donnees_perso.php" /> + <option value="$PROJECT_DIR$/Code/BD/fill_eleve.sql" /> + <option value="$PROJECT_DIR$/Code/BD/fill_eleve.csv" /> + <option value="$PROJECT_DIR$/Code/config.php" /> + <option value="$PROJECT_DIR$/Code/affichage_arbre.php" /> + <option value="$PROJECT_DIR$/Code/config_s.php" /> + <option value="$PROJECT_DIR$/Code/style.css" /> + <option value="$PROJECT_DIR$/Code/visualisation_profil.php" /> + <option value="$PROJECT_DIR$/Code/connect.php" /> + <option value="$PROJECT_DIR$/Code/profil_modif.php" /> + <option value="$PROJECT_DIR$/Code/validation_modif.php" /> + <option value="$PROJECT_DIR$/Code/style_form.css" /> + <option value="$PROJECT_DIR$/Code/style_mail.css" /> + <option value="$PROJECT_DIR$/Code/creation_donnees_perso2.php" /> + <option value="$PROJECT_DIR$/Code/recherche_personne.html" /> + <option value="$PROJECT_DIR$/Code/recherche_lien_de_parente.html" /> + <option value="$PROJECT_DIR$/Code/email.html" /> + <option value="$PROJECT_DIR$/Code/add_lien.php" /> + <option value="$PROJECT_DIR$/Code/resultat_personne.php" /> + <option value="$PROJECT_DIR$/Code/accueil.php" /> + <option value="$PROJECT_DIR$/Code/resultat_lien_parente.php" /> + <option value="$PROJECT_DIR$/Code/mise_en_page.php" /> + <option value="$PROJECT_DIR$/Code/add_lien2.php" /> + <option value="$PROJECT_DIR$/Code/recherche_personne.php" /> + <option value="$PROJECT_DIR$/Code/recherche_lien_de_parente.php" /> + <option value="$PROJECT_DIR$/Code/profil_vision.php" /> + <option value="$PROJECT_DIR$/Code/creation_donnees_perso.php" /> + <option value="$PROJECT_DIR$/Code/creer_profil1.php" /> + <option value="$PROJECT_DIR$/Code/creation_donnes_perso2.php" /> + <option value="$PROJECT_DIR$/Code/BD/fill_assoc_eleve.csv" /> + <option value="$PROJECT_DIR$/Code/creer_profil2.php" /> + <option value="$PROJECT_DIR$/Code/BD/create_eleve.sql" /> + <option value="$PROJECT_DIR$/Code/checkForm.js" /> + </list> + </option> + </component> + <component name="JsBuildToolGruntFileManager" detection-done="true" /> + <component name="JsBuildToolPackageJson" detection-done="true" /> + <component name="JsGulpfileManager"> + <detection-done>true</detection-done> + </component> + <component name="PhpServers"> + <servers /> + </component> + <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" interpreter_name="PHP 5.5" /> + <component name="ProjectFrameBounds"> + <option name="x" value="-1" /> + <option name="width" value="1922" /> + <option name="height" value="1055" /> + </component> + <component name="ProjectLevelVcsManager" settingsEditedManually="false"> + <OptionsSetting value="true" id="Add" /> + <OptionsSetting value="true" id="Remove" /> + <OptionsSetting value="true" id="Checkout" /> + <OptionsSetting value="true" id="Update" /> + <OptionsSetting value="true" id="Status" /> + <OptionsSetting value="true" id="Edit" /> + <ConfirmationsSetting value="0" id="Add" /> + <ConfirmationsSetting value="0" id="Remove" /> + </component> + <component name="ProjectView"> + <navigator currentView="ProjectPane" proportions="" version="1"> + <flattenPackages /> + <showMembers /> + <showModules /> + <showLibraryContents /> + <hideEmptyPackages /> + <abbreviatePackageNames /> + <autoscrollToSource /> + <autoscrollFromSource /> + <sortByType /> + <manualOrder /> + <foldersAlwaysOnTop value="true" /> + </navigator> + <panes> + <pane id="Scope" /> + <pane id="ProjectPane"> + <subPane> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="Projet-web-2016-SAHA" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="Projet-web-2016-SAHA" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Projet-web-2016-SAHA" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="Projet-web-2016-SAHA" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Projet-web-2016-SAHA" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Code" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="Projet-web-2016-SAHA" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Projet-web-2016-SAHA" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="Code" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="BD" /> + <option name="myItemType" value="com.jetbrains.php.projectView.PhpTreeStructureProvider$1" /> + </PATH_ELEMENT> + </PATH> + </subPane> + </pane> + <pane id="Scratches" /> + </panes> + </component> + <component name="PropertiesComponent"> + <property name="last_opened_file_path" value="$PROJECT_DIR$/Code/BD/fill_eleve.sql" /> + <property name="WebServerToolWindowFactoryState" value="false" /> + <property name="settings.editor.selected.configurable" value="web.server" /> + <property name="js-jscs-nodeInterpreter" value="/usr/bin/node" /> + <property name="settings.editor.splitter.proportion" value="0.2" /> + <property name="com.intellij.database.dataSource.DataSourceTemplate" value="DDL Data Source PostgreSQL" /> + <property name="DefaultHtmlFileTemplate" value="HTML File" /> + </component> + <component name="RecentsManager"> + <key name="CopyFile.RECENT_KEYS"> + <recent name="$PROJECT_DIR$/Code" /> + </key> + <key name="MoveFile.RECENT_KEYS"> + <recent name="$PROJECT_DIR$/Code/BD" /> + </key> + </component> + <component name="RunManager" selected="JavaScript Debug.recherche_personne.html"> + <configuration default="false" name="recherche_personne.html" type="JavascriptDebugType" factoryName="JavaScript Debug" temporary="true" nameIsGenerated="true" uri="http://proj_web.com/Projet-web-2016-SAHA/Code/recherche_personne.html"> + <method /> + </configuration> + <configuration default="true" type="JavascriptDebugType" factoryName="JavaScript Debug"> + <method /> + </configuration> + <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit"> + <TestRunner /> + <method /> + </configuration> + <configuration default="true" type="PhpBehatConfigurationType" factoryName="Behat"> + <BehatRunner /> + <method /> + </configuration> + <configuration default="true" type="PhpLocalRunConfigurationType" factoryName="PHP Console"> + <method /> + </configuration> + <configuration default="true" type="js.build_tools.gulp" factoryName="Gulp.js"> + <node-interpreter>project</node-interpreter> + <node-options /> + <gulpfile /> + <tasks /> + <arguments /> + <envs /> + <method /> + </configuration> + <configuration default="true" type="js.build_tools.npm" factoryName="npm"> + <command value="run-script" /> + <scripts /> + <node-interpreter value="project" /> + <envs /> + <method /> + </configuration> + <list size="1"> + <item index="0" class="java.lang.String" itemvalue="JavaScript Debug.recherche_personne.html" /> + </list> + <recent_temporary> + <list size="1"> + <item index="0" class="java.lang.String" itemvalue="JavaScript Debug.recherche_personne.html" /> + </list> + </recent_temporary> + </component> + <component name="ShelveChangesManager" show_recycled="false"> + <option name="remove_strategy" value="false" /> + </component> + <component name="SvnConfiguration"> + <configuration /> + </component> + <component name="TaskManager"> + <task active="true" id="Default" summary="Default task"> + <changelist id="a90e8976-6931-4e0c-8a88-bbfbe5c0b6dd" name="Default" comment="" /> + <created>1461895742021</created> + <option name="number" value="Default" /> + <option name="presentableId" value="Default" /> + <updated>1461895742021</updated> + <workItem from="1461895743434" duration="11003000" /> + <workItem from="1462122041876" duration="5796000" /> + <workItem from="1462485799657" duration="49014000" /> + <workItem from="1462644897355" duration="22567000" /> + </task> + <servers /> + </component> + <component name="TimeTrackingManager"> + <option name="totallyTimeSpent" value="88380000" /> + </component> + <component name="ToolWindowManager"> + <frame x="-1" y="0" width="1922" height="1055" extended-state="6" /> + <editor active="true" /> + <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.18125" 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.3291536" sideWeight="0.50208336" 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="true" show_stripe_button="true" weight="0.104166664" 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.3291536" sideWeight="0.49791667" order="1" 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.39916405" sideWeight="0.5" order="5" 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="true" weight="0.33" sideWeight="0.5" order="9" 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" /> + <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="8" side_tool="false" content_ui="tabs" /> + <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39916405" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <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="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" /> + </layout> + </component> + <component name="Vcs.Log.UiProperties"> + <option name="RECENTLY_FILTERED_USER_GROUPS"> + <collection /> + </option> + <option name="RECENTLY_FILTERED_BRANCH_GROUPS"> + <collection /> + </option> + </component> + <component name="VcsContentAnnotationSettings"> + <option name="myLimit" value="2678400000" /> + </component> + <component name="XDebuggerManager"> + <breakpoint-manager /> + <watches-manager /> + </component> + <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/Code/tpStyle.css" /> + <entry file="file://$PROJECT_DIR$/Code/tpQuitter.php" /> + <entry file="file://$PROJECT_DIR$/Code/tpInit.php" /> + <entry file="file://$PROJECT_DIR$/Code/tpMenu.php" /> + <entry file="file://$PROJECT_DIR$/Code/form_1.html" /> + <entry file="file://$PROJECT_DIR$/Code/form_2.html" /> + <entry file="file://$PROJECT_DIR$/Code/creer_profil.php" /> + <entry file="file://$PROJECT_DIR$/Code/modification_donnees_perso.php" /> + <entry file="file://$PROJECT_DIR$/Code/BD/fill_assoc_eleve.sql"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/BD/fill_assoc.sql"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/BD/fill_eleve.sql"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="84" selection-start-line="0" selection-start-column="84" selection-end-line="0" selection-end-column="84" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/modif_gestion_profils.php" /> + <entry file="file://$PROJECT_DIR$/Code/mise_en_page2.php" /> + <entry file="file://$PROJECT_DIR$/Code/accueil2.php" /> + <entry file="file://$PROJECT_DIR$/Code/recherche_personnem.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="435"> + <caret line="29" column="28" selection-start-line="29" selection-start-column="28" selection-end-line="29" selection-end-column="28" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/config_s.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="105"> + <caret line="12" column="0" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/connect.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="432"> + <caret line="81" column="16" selection-start-line="81" selection-start-column="16" selection-end-line="81" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/style_form.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="237"> + <caret line="16" column="4" selection-start-line="16" selection-start-column="4" selection-end-line="16" selection-end-column="4" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/Exemples de code/ex_cerulean.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="174"> + <caret line="48" column="32" selection-start-line="48" selection-start-column="32" selection-end-line="48" selection-end-column="32" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/style_mail.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="30"> + <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/style.css"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="255"> + <caret line="17" column="1" selection-start-line="17" selection-start-column="1" selection-end-line="17" selection-end-column="1" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/affichage_arbre.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="120"> + <caret line="8" column="0" selection-start-line="8" selection-start-column="0" selection-end-line="8" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/add_lien2..php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/config.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="105"> + <caret line="7" column="0" selection-start-line="7" selection-start-column="0" selection-end-line="7" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/recherche_personne.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="345"> + <caret line="23" column="73" selection-start-line="23" selection-start-column="73" selection-end-line="23" selection-end-column="73" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/recherche_lien_de_parente.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="480"> + <caret line="32" column="73" selection-start-line="32" selection-start-column="73" selection-end-line="32" selection-end-column="73" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/email.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="450"> + <caret line="30" column="15" selection-start-line="16" selection-start-column="12" selection-end-line="30" selection-end-column="15" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/resultat_personne.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="814"> + <caret line="98" column="7" selection-start-line="98" selection-start-column="7" selection-end-line="98" selection-end-column="7" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/recherche_personne.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="330"> + <caret line="30" column="28" selection-start-line="30" selection-start-column="28" selection-end-line="30" selection-end-column="28" /> + <folding> + <element signature="e#6#162#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/add_lien2.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="33" column="29" selection-start-line="33" selection-start-column="29" selection-end-line="33" selection-end-column="29" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/resultat_lien_parente.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="814"> + <caret line="211" column="7" selection-start-line="211" selection-start-column="7" selection-end-line="211" selection-end-column="7" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/recherche_lien_de_parente.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="11" column="3" selection-start-line="11" selection-start-column="3" selection-end-line="11" selection-end-column="3" /> + <folding> + <element signature="e#6#162#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/validation_modif.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="240"> + <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/creation_donnees_perso2.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="375"> + <caret line="30" column="6" selection-start-line="30" selection-start-column="6" selection-end-line="30" selection-end-column="6" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/creation_donnes_perso2.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="874"> + <caret line="82" column="7" selection-start-line="82" selection-start-column="7" selection-end-line="82" selection-end-column="7" /> + <folding> + <element signature="e#6#85#0#PHP" expanded="true" /> + <marker date="1462736005393" expanded="true" signature="712:795" placeholder="SELECT nom_e... eleve" /> + <marker date="1462736005393" expanded="true" signature="1109:1176" placeholder="UPDATE eleve... " /> + <marker date="1462736005393" expanded="true" signature="1297:1362" placeholder="UPDATE eleve... " /> + <marker date="1462736005393" expanded="true" signature="1498:1576" placeholder="INSERT INTO eleve... " /> + <marker date="1462736005393" expanded="true" signature="1673:1749" placeholder="INSERT INTO eleve... " /> + <marker date="1462736005393" expanded="true" signature="1842:1914" placeholder="INSERT INTO eleve... " /> + <marker date="1462736005393" expanded="true" signature="2007:2079" placeholder="INSERT INTO eleve... " /> + <marker date="1462736005393" expanded="true" signature="2176:2252" placeholder="INSERT INTO eleve... " /> + <marker date="1462736005393" expanded="true" signature="2351:2429" placeholder="INSERT INTO eleve... " /> + <marker date="1462736005393" expanded="true" signature="2600:2637" placeholder="SELECT id_as... assoc" /> + <marker date="1462736005393" expanded="true" signature="2684:2746" placeholder="INSERT INTO assoc_eleve... " /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/BD/fill_assoc_eleve.csv"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="60"> + <caret line="4" column="7" selection-start-line="4" selection-start-column="7" selection-end-line="4" selection-end-column="7" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/BD/fill_assoc.csv"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/BD/fill_eleve.csv"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="45"> + <caret line="3" column="51" selection-start-line="3" selection-start-column="51" selection-end-line="3" selection-end-column="51" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/BD/fill_liens.csv"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/accueil.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="-881"> + <caret line="9" column="7" selection-start-line="9" selection-start-column="5" selection-end-line="9" selection-end-column="7" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/visualisation_profil.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="870"> + <caret line="63" column="1" selection-start-line="63" selection-start-column="1" selection-end-line="63" selection-end-column="1" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/mise_en_page.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="60"> + <caret line="10" column="35" selection-start-line="10" selection-start-column="35" selection-end-line="10" selection-end-column="35" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/profil_modif.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="570"> + <caret line="68" column="33" selection-start-line="68" selection-start-column="33" selection-end-line="68" selection-end-column="33" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/creer_profil2.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="420"> + <caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" /> + <folding> + <element signature="e#6#85#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/BD/create_eleve.sql"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="315"> + <caret line="21" column="32" selection-start-line="21" selection-start-column="32" selection-end-line="21" selection-end-column="32" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/checkForm.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="763"> + <caret line="130" column="5" selection-start-line="130" selection-start-column="5" selection-end-line="130" selection-end-column="5" /> + <folding> + <element signature="n#!!doc;n#validateForm1#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/creer_profil1.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="105"> + <caret line="12" column="50" selection-start-line="12" selection-start-column="50" selection-end-line="12" selection-end-column="50" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/creation_donnees_perso.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="178"> + <caret line="20" column="0" selection-start-line="20" selection-start-column="0" selection-end-line="20" selection-end-column="0" /> + <folding> + <element signature="e#6#85#0#PHP" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/add_lien.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="165"> + <caret line="16" column="46" selection-start-line="16" selection-start-column="46" selection-end-line="16" selection-end-column="46" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/profil_vision.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="750"> + <caret line="173" column="99" selection-start-line="173" selection-start-column="99" selection-end-line="173" selection-end-column="99" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/Code/ajout_lien.php"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </component> +</project> \ No newline at end of file diff --git a/Code/BD/create_eleve.sql b/Code/BD/create_eleve.sql index 91d53915d751bbe49b5f29ecfd629026b057c99d..14192d172a7a82a3cf1e6fbf41854531563a7302 100644 --- a/Code/BD/create_eleve.sql +++ b/Code/BD/create_eleve.sql @@ -19,7 +19,7 @@ CREATE TABLE eleve ( ddn DATE, tel INTEGER, mail VARCHAR(115) UNIQUE NOT NULL, - lieu VARCHAR(10), + lieu VARCHAR(10) NOT NULL, gpe_td VARCHAR(3), admins VARCHAR(1), situation VARCHAR(10), diff --git a/Code/BD/create_eleve.sql.orig b/Code/BD/create_eleve.sql.orig new file mode 100644 index 0000000000000000000000000000000000000000..7cc58257510bdbdb20f3cd0e758f3015f3356d2f --- /dev/null +++ b/Code/BD/create_eleve.sql.orig @@ -0,0 +1,129 @@ +-- ################################################################### +-- # Application : SQL script +-- # File : create_bases.sql +-- # Revision : april 2016 +-- # Author : SAHA +-- # Function : Create the client relation +-- ################################################################### + +-- If table already exists + +DROP TABLE eleve; + +CREATE TABLE eleve ( +<<<<<<< HEAD:Code/BD/create_eleve.sql + login_eleve VARCHAR(100), + nom_eleve VARCHAR(50) NOT NULL, + prenom VARCHAR(50) NOT NULL, + surnom VARCHAR(50), + promo INTEGER, + ddn DATE, + tel INTEGER, + mail VARCHAR(115), + lieu VARCHAR NOT NULL, + gpe_td VARCHAR(3), + admins VARCHAR(1), + situation VARCHAR(10), + CONSTRAINT pk_eleve PRIMARY KEY (login_eleve), + CONSTRAINT dom_lieu CHECK (lieu='Evry' OR lieu='Strasbourg'), + CONSTRAINT dom_date CHECK (promo > 1975), + CONSTRAINT dom_tel CHECK (tel > 0 AND tel < 9999999999), + CONSTRAINT dom_situation CHECK (situation='FIPA' OR situation='Initiale'), + CONSTRAINT dom_admins CHECK (admins='y' OR admins='n')); + +GRANT ALL PRIVILEGES ON eleve TO postgres; + +DROP TABLE IF EXISTS assoc; + +CREATE TABLE assoc ( + id_assoc INTEGER, + nom VARCHAR(50), + resume VARCHAR(150), + CONSTRAINT pk_assoc PRIMARY KEY (id_assoc)); + +GRANT ALL PRIVILEGES ON assoc TO postgres; +======= + login_eleve VARCHAR(100), + nom_eleve VARCHAR(50) NOT NULL, + prenom VARCHAR(50) NOT NULL, + surnom VARCHAR(50), + promo INTEGER, + ddn DATE, + tel INTEGER, + mail VARCHAR(115), + lieu VARCHAR NOT NULL, + gpe_td VARCHAR(3), + admins VARCHAR(1), + situation VARCHAR(10), + CONSTRAINT pk_eleve PRIMARY KEY (login_eleve), + CONSTRAINT dom_tel CHECK(tel < 1000000000 AND tel > 100000000), + CONSTRAINT dom_mail CHECK (mail LIKE '%@%.%'), + CONSTRAINT dom_lieu CHECK(lieu IN ('Evry', 'Strasbourg')), + CONSTRAINT dom_gpe_td CHECK (gpe_td LIKE '%.%'), + CONSTRAINT dom_promo CHECK (promo > 1975), + CONSTRAINT dom_situation CHECK (situation IN ('FIPA', 'Initiale')), + CONSTRAINT dom_admins CHECK (admins IN ('y', 'n'))); + +--GRANT ALL PRIVILEGES ON eleve TO admin; + +DROP TABLE assoc; + +CREATE TABLE assoc ( + id_assoc INTEGER, + nom VARCHAR(50), + resume VARCHAR(150), + CONSTRAINT pk_assoc PRIMARY KEY (id_assoc)); + +--GRANT ALL PRIVILEGES ON assoc TO admin; +>>>>>>> 6123cc64a146ed36e9dded90a99c3d29c32c0cf3:Code/create_eleve.sql + +DROP TABLE liens; + +CREATE TABLE liens ( +<<<<<<< HEAD:Code/BD/create_eleve.sql + parrain VARCHAR(50), + filleul VARCHAR(50), + valide BOOLEAN, + CONSTRAINT pk_admin_liens PRIMARY KEY (parrain,filleul)); + +GRANT ALL PRIVILEGES ON liens TO postgres; + +DROP TABLE IF EXISTS liens_eleve; + +CREATE TABLE liens_eleve ( + login_eleve VARCHAR(100), + id_lien INTEGER, + CONSTRAINT pk_admin_liens_eleve PRIMARY KEY (id_lien)); + +GRANT ALL PRIVILEGES ON liens_eleve TO postgres; +======= + parrain VARCHAR(50), + filleul VARCHAR(50), + valide VARCHAR(1), + CONSTRAINT pk_liens PRIMARY KEY (parrain,filleul), + CONSTRAINT fk_parrain FOREIGN KEY (parrain) REFERENCES eleve, + CONSTRAINT fk_filleul FOREIGN KEY (filleul) REFERENCES eleve, + CONSTRAINT dom_valide CHECK (valide IN ('y', 'n'))); + +--GRANT ALL PRIVILEGES ON liens TO admin; + +>>>>>>> 6123cc64a146ed36e9dded90a99c3d29c32c0cf3:Code/create_eleve.sql + +DROP TABLE assoc_eleve; + +CREATE TABLE assoc_eleve ( +<<<<<<< HEAD:Code/BD/create_eleve.sql + login_eleve VARCHAR(100), + id_assoc INTEGER, + CONSTRAINT pk_admin_assoc_eleve PRIMARY KEY (id_assoc)); + +GRANT ALL PRIVILEGES ON assoc_eleve TO postgres; +======= + login_eleve VARCHAR(100), + id_assoc INTEGER, + CONSTRAINT pk_assoc_eleve PRIMARY KEY (login_eleve, id_assoc), + CONSTRAINT fk_eleve FOREIGN KEY (login_eleve) REFERENCES eleve, + CONSTRAINT fk_assoc FOREIGN KEY (id_assoc) REFERENCES assoc); + +--GRANT ALL PRIVILEGES ON assoc_eleve TO admin; +>>>>>>> 6123cc64a146ed36e9dded90a99c3d29c32c0cf3:Code/create_eleve.sql diff --git a/Code/BD/fill_assoc_eleve.csv b/Code/BD/fill_assoc_eleve.csv index 78cb80d646e8f6434aa92762f48a4adc24c7441d..89b5c51420ecb51287e18dd9aa40f25d13ea0d8b 100644 --- a/Code/BD/fill_assoc_eleve.csv +++ b/Code/BD/fill_assoc_eleve.csv @@ -1,5 +1,5 @@ -MichautSandra,1 -MichautSandra,3 -GentyAnaïs,1 -GentyAnaïs,2 -GentyAnaïs,4 +michaut.sandra,1 +michaut.sandra,3 +genty.anaïs,1 +genty.anaïs,2 +genty.anaïs,4 diff --git a/Code/checkForm.js b/Code/checkForm.js index 0b7090b8ae858b59ade60271cb9b5bba62e08951..516fa494d26163d9485a0a7e9b957d8282c49c13 100644 --- a/Code/checkForm.js +++ b/Code/checkForm.js @@ -93,9 +93,9 @@ function validateForm3() { var x6 = document.forms["creation"]["Surnom"].value; var x7 = document.forms["creation"]["promo"].value; var x8 = document.forms["creation"]["Tel"].value; - var x9 = document.forms["creation"]["Ddn"].value;/* + var x9 = document.forms["creation"]["Ddn"].value; var x10_1 = document.getElementById("ecole1").checked; - var x10_2 = document.getElementById("ecole2").checked;*/ + var x10_2 = document.getElementById("ecole2").checked; validateForm2(); if (x7 == null || x7 == "") { alert("The field promo must be filled"); @@ -128,11 +128,11 @@ function validateForm3() { if (x7.length != 4) { alert("Please enter a valid year"); return false; - }/* + } if (x10_1 == false && !x10_2 == false) { alert("Please select your campus"); return false; - }*/ + } } function validateForm4() { diff --git a/Code/config.php b/Code/config.php index 980962854f4bb30d5f8209e0b767e443ec498014..2dbc420d7f9ed48013fafead6bfb029929da8b4b 100644 --- a/Code/config.php +++ b/Code/config.php @@ -5,4 +5,4 @@ $nomBase = "project_web"; $nomRoot = "postgres"; $mdpRoot = "postgres"; $nomHost="proj_web.com"; -?> + diff --git a/Code/config_s.php b/Code/config_s.php index 879995dcc0b0ca6e7ead45c8a8ccf082130cc9bc..63f995962c9a07a52f05b365ac60b880c88b7d5c 100644 --- a/Code/config_s.php +++ b/Code/config_s.php @@ -10,4 +10,3 @@ $nomBase = "test1"; $nomRoot = "sandra"; $mdpRoot = "Sandra"; $nomHost="localhost"; -?> diff --git a/Code/creation_donnees_perso.php b/Code/creation_donnees_perso.php index 59c19875c74a79e09c89ef06775e3eb1e138d4fe..612aef40604779e285d73751fd5b165024f9b8af 100644 --- a/Code/creation_donnees_perso.php +++ b/Code/creation_donnees_perso.php @@ -21,7 +21,7 @@ $login=strtolower($nomUser).'.'.strtolower($prenomUser); /* Le login est donné enTete("Création du profil", -1); -$possible = possible_creer_login ($nomUser, $nomHost, $nomBase, $nomRoot, $mdpRoot); +$possible = possible_creer_login($nomUser, $nomHost, $nomBase, $nomRoot, $mdpRoot); if ($possible == -3) { print "<p class='erreur'>Erreur lors de la connexion à la base de données, rafraîchir la page ou contacter l'administrateur</p>"; } diff --git a/Code/creer_profil1.php b/Code/creer_profil1.php index ed9c38de427472f4f46e46ae63b70bd6b31bbc9d..8db227937f658f04afa7f139dae9a9ac6d2d38b9 100644 --- a/Code/creer_profil1.php +++ b/Code/creer_profil1.php @@ -10,7 +10,7 @@ session_start(); include("mise_en_page.php"); -enTete("Création de profil",$_SESSION['nomUser']); // A revoir +enTete("Création de profil",$_SESSION['nomUser']); print "<form name=\"creation\" action=\"creation_donnees_perso.php\" method='get' onsubmit='return validateForm2()'>\n"; diff --git a/Code/creer_profil2.php b/Code/creer_profil2.php new file mode 100644 index 0000000000000000000000000000000000000000..04a90baeb63c5d2cffc0a9a1489581beb740730a --- /dev/null +++ b/Code/creer_profil2.php @@ -0,0 +1,102 @@ +<?php +/** + * Created by PhpStorm. + * User: genty + * Date: 06/05/16 + * Time: 02:22 + */ + +include("mise_en_page.php"); +include("creation_donnees_perso.php"); + +enTete("Création de profil",$_SESSION['nomUser']); + +print "<form name=\"creation\" action='profil_modif.php' method='get' onsubmit='return validateForm3()'>\n"; + +print "<h4>Données personnelles: </h4>\n"; + +print "<script src=\"checkForm.js\"></script>\n"; + +print "<input type='hidden' name='submitted' value='1'/>\n"; + +$nomUser = $_SESSION['nomUser']; +$prenomUser = $_SESSION['prenomUser']; +$login = $_SESSION['login']; +$mdp = $_SESSION['mdp']; +$mail = $_SESSION['mail']; + +print "<p>Nom: $nomUser (non modifiable)\n<br/>\n"; +print "Prénom: $prenomUser (non modifiable)<br/>\n"; +print "Surnom: <input type=\"text\" size=\"8\" name=\"Surnom\" pattern=\"[^'()\[\]{}\\/\x22]+\" title=\"Cannot contain {,(,[,),],},',/,\ or ''\"/> <br/>\n "; /* Rq : pb ici */ +print "Promo: <input type=\"number\" size=\"5\" min=\"1960\" max=\"2020\" maxlength=\"4\" name=\"promo\"/> <br/>\n"; +print "Date de naissance (AAAA-MM-JJ): <input type=\"date\" name=\"Ddn\" min='1940-01-01' max='2010-12-31'/><br/>\n"; +print "Téléphone: <input type=\"number\" size=\"12\" min='0000000000' maxlength='10' name=\"Tel\"/> <br/>\n"; +print "Mail: <input type=\"email\" size=\"15\" name=\"Mail\" value=$mail pattern='[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,3}$' title='Must be valid email format'/> <br/><br/>\n"; + +print "ENSIIE de: <br/>\n"; + +print "<input type=\"radio\" name=\"ecole\" value=\"Evry\" /> Evry <br/>\n"; +print "<input type=\"radio\" name=\"ecole\" value=\"Strasbourg\" /> Strasbourg <br/><br/>\n"; + +print "Groupe de TP/TD: <br/>\n"; + +print "<input type=\"radio\" name=\"gpe\" value=\"1.1\" /> 1.1 \n"; +print "<input type=\"radio\" name=\"gpe\" value=\"1.2\" /> 1.2 <br/>\n"; +print "<input type=\"radio\" name=\"gpe\" value=\"2.1\" /> 2.1 \n"; +print "<input type=\"radio\" name=\"gpe\" value=\"2.2\" /> 2.2 <br/>\n"; +print "<input type=\"radio\" name=\"gpe\" value=\"3.1\" /> 3.1 \n"; +print "<input type=\"radio\" name=\"gpe\" value=\"3.2\" /> 3.2 <br/>\n"; +print "<input type=\"radio\" name=\"gpe\" value=\"4.1\" /> 4.1 \n"; +print "<input type=\"radio\" name=\"gpe\" value=\"4.2\" /> 4.2 <br/>\n"; +print "<input type=\"radio\" name=\"gpe\" value=\"0\" /> Pas de groupe<br/>\n<br/>\n"; + +print "Membre de: <ul>\n"; + +print "<input type='checkbox' name='assoc' value=\"aperitife\">AperItIfE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"arise\">ARISE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"astronomiie\">Astronomiie<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"manga\">Bakaclub<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"bda\">BDA<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"bdsf\">BDSF<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"aeiie\">Bureau des Eleves<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"cccm\">CCCM<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"cid\">CID<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"comdiie\">comDiie<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"craftiie\">CraftIIE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"cuisine\">CuIsInE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"dansiie\">Dansiie<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"diese\">Dièse<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"forumiie\">ForumIIE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"gala\">Gala<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"guiilde\">GuIIldE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"humaniie\">HUMANIIE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"iiepp\">IIE++<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"iimage\">IImagE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"iimonde\">IImondE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"i-tv\">i-TV<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"lanpartiie\">LanPartIIE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"bar\">Le Bar(c)<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"liien\">Liien<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"ludiie\">LudIIE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"lumiiere\">LumIIEre<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"magiie\">MagIIE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"muzzik\">Muzzik'<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"nightiies\">NightIIE's<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"robot\">ORiGiNe<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"securitiie\">SecuritIIE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"radioactive\">RadIoactIvE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"realitiie\">RealitIIE<br/>\n"; +print "<input type='checkbox' name='assoc' value=\"resiie\">ResIIE<br/>\n"; + +print "</ul></p>\n"; + +print "Mot de passe : <input type='password' name='psw' value=$pwd pattern=\"(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}\" title='Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters'/>\n"; +print "Vérification du mot de passe : <input type='password' name='psw2' value=$pwd pattern=\"(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{8,}\" title='Must contain at least one number and one uppercase and lowercase letter, and at least 8 or more characters'/>\n"; + +print "<p><input type=\"submit\" value=\"Valider\" name=\"validation\" /></p>\n"; + +print "</form>\n"; + +retourAuMenu(); + +pied(); diff --git a/Code/style.css b/Code/style.css index 8f46821131914b6a0ae44a3144eaee47a2d05dc8..7c0ec56e2ccd84f3bbc22191e50e2614b56f3497 100644 --- a/Code/style.css +++ b/Code/style.css @@ -3,12 +3,12 @@ h1{ text-align: center; color: OrangeRed; - text-shadow: 0px 2px #665544; + text-shadow: 0 2px #665544; } h4{ color: Orange; - text-shadow: 0px 1px #996633; + text-shadow: 0 1px #996633; } p.erreur{ @@ -18,7 +18,7 @@ p.erreur{ p.up{ text-align: center; color: #665544; - text-shadow: 0px 1px #996633; + text-shadow: 0 1px #996633; } p.down{ diff --git a/Code/style_form.css b/Code/style_form.css index 48e1649fa03c886cc34c636656277eb50432d2f1..9c85fdc65aee0a3f330815ef391d53306444f4d0 100644 --- a/Code/style_form.css +++ b/Code/style_form.css @@ -14,16 +14,15 @@ form{ fieldset{ margin-left: auto; margin-right: auto; - border-color : teal; - border-style : groove; - width:600; + border: groove teal; + width:600px; text-align: center; vertical-align: top; } legend{ color:teal; - left:50; + left:50px; text-align: center; font-weight:bolder; font-size:large; diff --git a/Code/style_mail.css b/Code/style_mail.css index 2c2fcf0f4ae6beeca387bc4c6de2133759f4aca0..8a1a1fd3dc268fd0ce9f03ffe33370ca220aef98 100644 --- a/Code/style_mail.css +++ b/Code/style_mail.css @@ -1,6 +1,6 @@ fieldset{ border-color: purple; -width: 400; +width: 400px; margin-left: auto; margin-right: auto; text-align: center;