Browse Source

Сделана главная страница исполнителя
Начата страница с проектами (пока пустая)
Изменен контроллер и DAO для student
Дополнен css
В бд в таблице projects изменен формат varchar на text

Вероника 3 years ago
parent
commit
102f5f1c80

+ 39 - 0
.idea/artifacts/DBModule_war_exploded.xml

@@ -2,9 +2,48 @@
   <artifact type="exploded-war" name="DBModule:war exploded">
     <output-path>$PROJECT_DIR$/DBModule/target/DBModule</output-path>
     <root id="root">
+      <element id="directory" name="WEB-INF">
+        <element id="directory" name="classes">
+          <element id="module-output" name="DBModule" />
+        </element>
+        <element id="directory" name="lib">
+          <element id="library" level="project" name="Maven: org.hibernate:antlr:2.7.5H3" />
+          <element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" />
+          <element id="library" level="project" name="Maven: org.hibernate.javax.persistence:hibernate-jpa-2.1-api:1.0.0.Draft-16" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-core:5.2.8.Final" />
+          <element id="library" level="project" name="Maven: org.jboss.logging:jboss-logging:3.3.0.Final" />
+          <element id="library" level="project" name="Maven: org.javassist:javassist:3.20.0-GA" />
+          <element id="library" level="project" name="Maven: antlr:antlr:2.7.7" />
+          <element id="library" level="project" name="Maven: org.jboss.spec.javax.transaction:jboss-transaction-api_1.2_spec:1.0.1.Final" />
+          <element id="library" level="project" name="Maven: org.jboss:jandex:2.0.3.Final" />
+          <element id="library" level="project" name="Maven: com.fasterxml:classmate:1.3.0" />
+          <element id="library" level="project" name="Maven: dom4j:dom4j:1.6.1" />
+          <element id="library" level="project" name="Maven: org.hibernate.common:hibernate-commons-annotations:5.0.1.Final" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.7" />
+          <element id="library" level="project" name="Maven: mysql:mysql-connector-java:5.1.40" />
+          <element id="library" level="project" name="Maven: jstl:jstl:1.2" />
+          <element id="library" level="project" name="Maven: org.hibernate:hibernate-entitymanager:5.2.8.Final" />
+          <element id="library" level="project" name="Maven: net.bytebuddy:byte-buddy:1.6.6" />
+          <element id="library" level="project" name="Maven: org.slf4j:slf4j-log4j12:1.5.6" />
+          <element id="library" level="project" name="Maven: org.slf4j:slf4j-api:1.5.6" />
+          <element id="library" level="project" name="Maven: log4j:log4j:1.2.14" />
+          <element id="library" level="project" name="Maven: javax.enterprise:cdi-api:1.2" />
+          <element id="library" level="project" name="Maven: javax.el:javax.el-api:3.0.0" />
+          <element id="library" level="project" name="Maven: javax.interceptor:javax.interceptor-api:1.2" />
+          <element id="library" level="project" name="Maven: javax.inject:javax.inject:1" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-jaxrs:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-core-asl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-mapper-asl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-mapper-lgpl:1.9.13" />
+          <element id="library" level="project" name="Maven: org.codehaus.jackson:jackson-core-lgpl:1.9.13" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.8.7" />
+          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.8.0" />
+        </element>
+      </element>
       <element id="directory" name="META-INF">
         <element id="file-copy" path="$PROJECT_DIR$/DBModule/target/DBModule/META-INF/MANIFEST.MF" />
       </element>
+      <element id="javaee-facet-resources" facet="DBModule/web/Web" />
     </root>
   </artifact>
 </component>

+ 4 - 4
.idea/dataSources.local.xml

@@ -2,21 +2,21 @@
 <project version="4">
   <component name="dataSourceStorageLocal">
     <data-source name="anketa@localhost" uuid="e66f3b80-d157-473d-b64a-69cd88715781">
-      <database-info product="MySQL" version="5.7.17-0ubuntu0.16.04.1" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.35 ( Revision: 5fb9c5849535c13917c2cf9baaece6ef9693ef27 )">
+      <database-info product="MySQL" version="5.7.12-log" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.35 ( Revision: 5fb9c5849535c13917c2cf9baaece6ef9693ef27 )">
         <extra-name-characters>#@</extra-name-characters>
         <identifier-quote-string>`</identifier-quote-string>
       </database-info>
-      <case-sensitivity plain-identifiers="exact" quoted-identifiers="exact" />
+      <case-sensitivity plain-identifiers="lower" quoted-identifiers="lower" />
       <secret-storage>master_key</secret-storage>
       <user-name>root</user-name>
       <resolve-scope>anketa:</resolve-scope>
     </data-source>
     <data-source name="hibernate.cfg.xml/Hibernate" uuid="92c07869-f0de-4821-ba4d-23dc56e0fded">
-      <database-info product="MySQL" version="5.7.17-0ubuntu0.16.04.1" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.35 ( Revision: 5fb9c5849535c13917c2cf9baaece6ef9693ef27 )">
+      <database-info product="MySQL" version="5.7.12-log" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.35 ( Revision: 5fb9c5849535c13917c2cf9baaece6ef9693ef27 )">
         <extra-name-characters>#@</extra-name-characters>
         <identifier-quote-string>`</identifier-quote-string>
       </database-info>
-      <case-sensitivity plain-identifiers="exact" quoted-identifiers="exact" />
+      <case-sensitivity plain-identifiers="lower" quoted-identifiers="lower" />
       <secret-storage>master_key</secret-storage>
       <user-name>root</user-name>
       <resolve-scope>anketa:</resolve-scope>

+ 0 - 6
.idea/dataSources.xml

@@ -37,12 +37,6 @@
         <library>
           <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-java-5.1.35-bin.jar</url>
         </library>
-        <library>
-          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-license.txt</url>
-        </library>
-        <library>
-          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-java-5.1.35-bin.jar</url>
-        </library>
       </libraries>
     </data-source>
   </component>

+ 123 - 118
.idea/dataSources/92c07869-f0de-4821-ba4d-23dc56e0fded.xml

@@ -10,272 +10,277 @@
     <schema id="4" parent="1" name="mysql"/>
     <schema id="5" parent="1" name="performance_schema"/>
     <schema id="6" parent="1" name="sys"/>
-    <table id="7" parent="2" name="clients"/>
-    <table id="8" parent="2" name="groups"/>
-    <table id="9" parent="2" name="mod_skill"/>
-    <table id="10" parent="2" name="moderators"/>
-    <table id="11" parent="2" name="project_mod_skill"/>
-    <table id="12" parent="2" name="project_skil_cat"/>
-    <table id="13" parent="2" name="projects"/>
-    <table id="14" parent="2" name="skil_cat"/>
-    <table id="15" parent="2" name="skil_list"/>
-    <table id="16" parent="2" name="skil_match"/>
-    <table id="17" parent="2" name="st_pr"/>
-    <table id="18" parent="2" name="students"/>
-    <table id="19" parent="2" name="students_skill"/>
-    <table id="20" parent="2" name="users"/>
-    <column id="21" parent="7" name="client_id">
+    <schema id="7" parent="1" name="cycle"/>
+    <schema id="8" parent="1" name="parking"/>
+    <schema id="9" parent="1" name="sakila"/>
+    <schema id="10" parent="1" name="test_db"/>
+    <schema id="11" parent="1" name="world"/>
+    <table id="12" parent="2" name="clients"/>
+    <table id="13" parent="2" name="groups"/>
+    <table id="14" parent="2" name="mod_skill"/>
+    <table id="15" parent="2" name="moderators"/>
+    <table id="16" parent="2" name="project_mod_skill"/>
+    <table id="17" parent="2" name="project_skil_cat"/>
+    <table id="18" parent="2" name="projects"/>
+    <table id="19" parent="2" name="skil_cat"/>
+    <table id="20" parent="2" name="skil_list"/>
+    <table id="21" parent="2" name="skil_match"/>
+    <table id="22" parent="2" name="st_pr"/>
+    <table id="23" parent="2" name="students"/>
+    <table id="24" parent="2" name="students_skill"/>
+    <table id="25" parent="2" name="users"/>
+    <column id="26" parent="12" name="client_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="22" parent="7" name="cl_family">
+    <column id="27" parent="12" name="cl_family">
       <Position>2</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="23" parent="7" name="cl_first_name">
+    <column id="28" parent="12" name="cl_first_name">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="24" parent="7" name="cl_sec_name">
+    <column id="29" parent="12" name="cl_sec_name">
       <Position>4</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="25" parent="7" name="cl_password">
+    <column id="30" parent="12" name="cl_password">
       <Position>5</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="26" parent="7" name="phone_number">
+    <column id="31" parent="12" name="phone_number">
       <Position>6</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="27" parent="7" name="e_mail">
+    <column id="32" parent="12" name="e_mail">
       <Position>7</Position>
       <DataType>varchar(100)|0</DataType>
     </column>
-    <column id="28" parent="7" name="company">
+    <column id="33" parent="12" name="company">
       <Position>8</Position>
       <DataType>varchar(100)|0</DataType>
     </column>
-    <column id="29" parent="7" name="pos">
+    <column id="34" parent="12" name="pos">
       <Position>9</Position>
       <DataType>varchar(100)|0</DataType>
     </column>
-    <column id="30" parent="7" name="hometown">
+    <column id="35" parent="12" name="hometown">
       <Position>10</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="31" parent="7" name="birthdate">
+    <column id="36" parent="12" name="birthdate">
       <Position>11</Position>
       <DataType>varchar(100)|0</DataType>
     </column>
-    <column id="32" parent="7" name="first_in">
+    <column id="37" parent="12" name="first_in">
       <Position>12</Position>
       <DataType>int(5)|0</DataType>
     </column>
-    <key id="33" parent="7" name="PRIMARY">
+    <key id="38" parent="12" name="PRIMARY">
       <ColNames>client_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="34" parent="8" name="group_id">
+    <column id="39" parent="13" name="group_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="35" parent="8" name="group_name">
+    <column id="40" parent="13" name="group_name">
       <Position>2</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="36" parent="8" name="year">
+    <column id="41" parent="13" name="year">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <key id="37" parent="8" name="PRIMARY">
+    <key id="42" parent="13" name="PRIMARY">
       <ColNames>group_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="38" parent="9" name="mod_sk_id">
+    <column id="43" parent="14" name="mod_sk_id">
       <Position>1</Position>
       <DataType>varchar(10)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="39" parent="9" name="skill_id">
+    <column id="44" parent="14" name="skill_id">
       <Position>2</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="40" parent="9" name="mod_id">
+    <column id="45" parent="14" name="mod_id">
       <Position>3</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="41" parent="9" name="rating">
+    <column id="46" parent="14" name="rating">
       <Position>4</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <key id="42" parent="9" name="PRIMARY">
+    <key id="47" parent="14" name="PRIMARY">
       <ColNames>mod_sk_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="43" parent="10" name="mod_id">
+    <column id="48" parent="15" name="mod_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="44" parent="10" name="mod_family">
+    <column id="49" parent="15" name="mod_family">
       <Position>2</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="45" parent="10" name="mod_first_name">
+    <column id="50" parent="15" name="mod_first_name">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="46" parent="10" name="mod_sec_name">
+    <column id="51" parent="15" name="mod_sec_name">
       <Position>4</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="47" parent="10" name="mod_password">
+    <column id="52" parent="15" name="mod_password">
       <Position>5</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="48" parent="10" name="mod_birthdate">
+    <column id="53" parent="15" name="mod_birthdate">
       <Position>6</Position>
       <DataType>varchar(255)|0</DataType>
       <DefaultExpression>&apos;11.11.2011&apos;</DefaultExpression>
     </column>
-    <column id="49" parent="10" name="mod_email">
+    <column id="54" parent="15" name="mod_email">
       <Position>7</Position>
       <DataType>varchar(255)|0</DataType>
       <DefaultExpression>&apos;pochta@mail.ru&apos;</DefaultExpression>
     </column>
-    <column id="50" parent="10" name="mod_hometown">
+    <column id="55" parent="15" name="mod_hometown">
       <Position>8</Position>
       <DataType>varchar(255)|0</DataType>
       <DefaultExpression>&apos;Город&apos;</DefaultExpression>
     </column>
-    <column id="51" parent="10" name="mod_phone">
+    <column id="56" parent="15" name="mod_phone">
       <Position>9</Position>
       <DataType>varchar(255)|0</DataType>
       <DefaultExpression>&apos;0000000000&apos;</DefaultExpression>
     </column>
-    <column id="52" parent="10" name="first_in">
+    <column id="57" parent="15" name="first_in">
       <Position>10</Position>
       <DataType>int(5)|0</DataType>
     </column>
-    <key id="53" parent="10" name="PRIMARY">
+    <key id="58" parent="15" name="PRIMARY">
       <ColNames>mod_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="54" parent="11" name="project_id">
+    <column id="59" parent="16" name="project_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="55" parent="11" name="skil_id">
+    <column id="60" parent="16" name="skil_id">
       <Position>2</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="56" parent="11" name="slave_id">
+    <column id="61" parent="16" name="slave_id">
       <Position>3</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="57" parent="11" name="rating">
+    <column id="62" parent="16" name="rating">
       <Position>4</Position>
       <DataType>int(11)|0</DataType>
     </column>
-    <column id="58" parent="11" name="pms_id">
+    <column id="63" parent="16" name="pms_id">
       <Position>5</Position>
       <DataType>varchar(45)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="59" parent="11" name="skill_name">
+    <column id="64" parent="16" name="skill_name">
       <Position>6</Position>
       <DataType>varchar(100)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <key id="60" parent="11" name="PRIMARY">
+    <key id="65" parent="16" name="PRIMARY">
       <ColNames>pms_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="61" parent="12" name="project_id">
+    <column id="66" parent="17" name="project_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="62" parent="12" name="skil_cat_id">
+    <column id="67" parent="17" name="skil_cat_id">
       <Position>2</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="63" parent="12" name="pcs_id">
+    <column id="68" parent="17" name="pcs_id">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <key id="64" parent="12" name="PRIMARY">
+    <key id="69" parent="17" name="PRIMARY">
       <ColNames>pcs_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="65" parent="13" name="pr_id">
+    <column id="70" parent="18" name="pr_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
       <SequenceIdentity>1</SequenceIdentity>
     </column>
-    <column id="66" parent="13" name="title">
+    <column id="71" parent="18" name="title">
       <Position>2</Position>
-      <DataType>varchar(45)|0</DataType>
+      <DataType>mediumtext|0</DataType>
     </column>
-    <column id="67" parent="13" name="description">
+    <column id="72" parent="18" name="description">
       <Position>3</Position>
-      <DataType>varchar(45)|0</DataType>
+      <DataType>mediumtext|0</DataType>
     </column>
-    <column id="68" parent="13" name="date_of_creation">
+    <column id="73" parent="18" name="date_of_creation">
       <Position>4</Position>
       <DataType>timestamp|0</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
     </column>
-    <column id="69" parent="13" name="status">
+    <column id="74" parent="18" name="status">
       <Position>5</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="70" parent="13" name="date_of_ready">
+    <column id="75" parent="18" name="date_of_ready">
       <Position>6</Position>
       <DataType>date|0</DataType>
     </column>
-    <column id="71" parent="13" name="sum">
+    <column id="76" parent="18" name="sum">
       <Position>7</Position>
       <DataType>int(11)|0</DataType>
     </column>
-    <column id="72" parent="13" name="mod_id">
+    <column id="77" parent="18" name="mod_id">
       <Position>8</Position>
       <DataType>int(11)|0</DataType>
     </column>
-    <column id="73" parent="13" name="client_id">
+    <column id="78" parent="18" name="client_id">
       <Position>9</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="74" parent="13" name="jsondata">
+    <column id="79" parent="18" name="jsondata">
       <Position>10</Position>
       <DataType>varchar(255)|0</DataType>
       <DefaultExpression>&apos;[]&apos;</DefaultExpression>
     </column>
-    <index id="75" parent="13" name="FK_ffb6klvqmnwust69pdfgau69i">
+    <index id="80" parent="18" name="FK_ffb6klvqmnwust69pdfgau69i">
       <ColNames>client_id</ColNames>
     </index>
-    <index id="76" parent="13" name="pr_modFK_idx">
+    <index id="81" parent="18" name="pr_modFK_idx">
       <ColNames>mod_id</ColNames>
     </index>
-    <key id="77" parent="13" name="PRIMARY">
+    <key id="82" parent="18" name="PRIMARY">
       <ColNames>pr_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <foreign-key id="78" parent="13" name="pr_modFK">
+    <foreign-key id="83" parent="18" name="pr_modFK">
       <ColNames>mod_id</ColNames>
       <RefSchemaName>anketa</RefSchemaName>
       <RefTableName>moderators</RefTableName>
@@ -283,92 +288,92 @@
       <OnUpdate>no-action</OnUpdate>
       <OnDelete>no-action</OnDelete>
     </foreign-key>
-    <foreign-key id="79" parent="13" name="FK_ffb6klvqmnwust69pdfgau69i">
+    <foreign-key id="84" parent="18" name="FK_ffb6klvqmnwust69pdfgau69i">
       <ColNames>client_id</ColNames>
       <RefSchemaName>anketa</RefSchemaName>
       <RefTableName>clients</RefTableName>
       <RefColNames>client_id</RefColNames>
     </foreign-key>
-    <column id="80" parent="14" name="skil_cat_id">
+    <column id="85" parent="19" name="skil_cat_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="81" parent="14" name="skil_cat_name">
+    <column id="86" parent="19" name="skil_cat_name">
       <Position>2</Position>
       <DataType>varchar(100)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <key id="82" parent="14" name="PRIMARY">
+    <key id="87" parent="19" name="PRIMARY">
       <ColNames>skil_cat_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="83" parent="15" name="skil_id">
+    <column id="88" parent="20" name="skil_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="84" parent="15" name="skil_name">
+    <column id="89" parent="20" name="skil_name">
       <Position>2</Position>
       <DataType>varchar(100)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <key id="85" parent="15" name="PRIMARY">
+    <key id="90" parent="20" name="PRIMARY">
       <ColNames>skil_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="86" parent="16" name="skil_cat_id">
+    <column id="91" parent="21" name="skil_cat_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="87" parent="16" name="skil_id">
+    <column id="92" parent="21" name="skil_id">
       <Position>2</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="88" parent="16" name="match_id">
+    <column id="93" parent="21" name="match_id">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="89" parent="16" name="skill_name">
+    <column id="94" parent="21" name="skill_name">
       <Position>4</Position>
       <DataType>varchar(100)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="90" parent="16" name="match_id">
+    <index id="95" parent="21" name="match_id">
       <ColNames>skil_cat_id
 skil_id</ColNames>
     </index>
-    <key id="91" parent="16" name="PRIMARY">
+    <key id="96" parent="21" name="PRIMARY">
       <ColNames>match_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="92" parent="17" name="id">
+    <column id="97" parent="22" name="id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="93" parent="17" name="st_id">
+    <column id="98" parent="22" name="st_id">
       <Position>2</Position>
       <DataType>int(11)|0</DataType>
     </column>
-    <column id="94" parent="17" name="pr_id">
+    <column id="99" parent="22" name="pr_id">
       <Position>3</Position>
       <DataType>int(11)|0</DataType>
     </column>
-    <index id="95" parent="17" name="prFK_idx">
+    <index id="100" parent="22" name="prFK_idx">
       <ColNames>pr_id</ColNames>
     </index>
-    <index id="96" parent="17" name="stFK_idx">
+    <index id="101" parent="22" name="stFK_idx">
       <ColNames>st_id</ColNames>
     </index>
-    <key id="97" parent="17" name="PRIMARY">
+    <key id="102" parent="22" name="PRIMARY">
       <ColNames>id</ColNames>
       <Primary>1</Primary>
     </key>
-    <foreign-key id="98" parent="17" name="stFK">
+    <foreign-key id="103" parent="22" name="stFK">
       <ColNames>st_id</ColNames>
       <RefSchemaName>anketa</RefSchemaName>
       <RefTableName>students</RefTableName>
@@ -376,7 +381,7 @@ skil_id</ColNames>
       <OnUpdate>no-action</OnUpdate>
       <OnDelete>no-action</OnDelete>
     </foreign-key>
-    <foreign-key id="99" parent="17" name="prFK">
+    <foreign-key id="104" parent="22" name="prFK">
       <ColNames>pr_id</ColNames>
       <RefSchemaName>anketa</RefSchemaName>
       <RefTableName>projects</RefTableName>
@@ -384,59 +389,59 @@ skil_id</ColNames>
       <OnUpdate>no-action</OnUpdate>
       <OnDelete>no-action</OnDelete>
     </foreign-key>
-    <column id="100" parent="18" name="students_id">
+    <column id="105" parent="23" name="students_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="101" parent="18" name="group_id">
+    <column id="106" parent="23" name="group_id">
       <Position>2</Position>
       <DataType>int(11)|0</DataType>
     </column>
-    <column id="102" parent="18" name="st_family">
+    <column id="107" parent="23" name="st_family">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="103" parent="18" name="st_first_name">
+    <column id="108" parent="23" name="st_first_name">
       <Position>4</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="104" parent="18" name="st_sec_name">
+    <column id="109" parent="23" name="st_sec_name">
       <Position>5</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="105" parent="18" name="st_pk_number">
+    <column id="110" parent="23" name="st_pk_number">
       <Position>6</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="106" parent="18" name="bithdate">
+    <column id="111" parent="23" name="bithdate">
       <Position>7</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="107" parent="18" name="phone_number">
+    <column id="112" parent="23" name="phone_number">
       <Position>8</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="108" parent="18" name="e_mail">
+    <column id="113" parent="23" name="e_mail">
       <Position>9</Position>
       <DataType>varchar(100)|0</DataType>
     </column>
-    <column id="109" parent="18" name="hometown">
+    <column id="114" parent="23" name="hometown">
       <Position>10</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="110" parent="18" name="first_in">
+    <column id="115" parent="23" name="first_in">
       <Position>11</Position>
       <DataType>int(5)|0</DataType>
     </column>
-    <index id="111" parent="18" name="stud_groupFK_idx">
+    <index id="116" parent="23" name="stud_groupFK_idx">
       <ColNames>group_id</ColNames>
     </index>
-    <key id="112" parent="18" name="PRIMARY">
+    <key id="117" parent="23" name="PRIMARY">
       <ColNames>students_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <foreign-key id="113" parent="18" name="stud_groupFK">
+    <foreign-key id="118" parent="23" name="stud_groupFK">
       <ColNames>group_id</ColNames>
       <RefSchemaName>anketa</RefSchemaName>
       <RefTableName>groups</RefTableName>
@@ -444,44 +449,44 @@ skil_id</ColNames>
       <OnUpdate>no-action</OnUpdate>
       <OnDelete>no-action</OnDelete>
     </foreign-key>
-    <column id="114" parent="19" name="st_sk_id">
+    <column id="119" parent="24" name="st_sk_id">
       <Position>1</Position>
       <DataType>varchar(10)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="115" parent="19" name="skill_id">
+    <column id="120" parent="24" name="skill_id">
       <Position>2</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="116" parent="19" name="stud_id">
+    <column id="121" parent="24" name="stud_id">
       <Position>3</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="117" parent="19" name="rating">
+    <column id="122" parent="24" name="rating">
       <Position>4</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <key id="118" parent="19" name="PRIMARY">
+    <key id="123" parent="24" name="PRIMARY">
       <ColNames>st_sk_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="119" parent="20" name="user_id">
+    <column id="124" parent="25" name="user_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="120" parent="20" name="user_login">
+    <column id="125" parent="25" name="user_login">
       <Position>2</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="121" parent="20" name="user_password">
+    <column id="126" parent="25" name="user_password">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <key id="122" parent="20" name="PRIMARY">
+    <key id="127" parent="25" name="PRIMARY">
       <ColNames>user_id</ColNames>
       <Primary>1</Primary>
     </key>

+ 121 - 116
.idea/dataSources/e66f3b80-d157-473d-b64a-69cd88715781.xml

@@ -10,272 +10,277 @@
     <schema id="4" parent="1" name="mysql"/>
     <schema id="5" parent="1" name="performance_schema"/>
     <schema id="6" parent="1" name="sys"/>
-    <table id="7" parent="2" name="clients"/>
-    <table id="8" parent="2" name="groups"/>
-    <table id="9" parent="2" name="mod_skill"/>
-    <table id="10" parent="2" name="moderators"/>
-    <table id="11" parent="2" name="project_mod_skill"/>
-    <table id="12" parent="2" name="project_skil_cat"/>
-    <table id="13" parent="2" name="projects"/>
-    <table id="14" parent="2" name="skil_cat"/>
-    <table id="15" parent="2" name="skil_list"/>
-    <table id="16" parent="2" name="skil_match"/>
-    <table id="17" parent="2" name="st_pr"/>
-    <table id="18" parent="2" name="students"/>
-    <table id="19" parent="2" name="students_skill"/>
-    <table id="20" parent="2" name="users"/>
-    <column id="21" parent="7" name="client_id">
+    <schema id="7" parent="1" name="cycle"/>
+    <schema id="8" parent="1" name="parking"/>
+    <schema id="9" parent="1" name="sakila"/>
+    <schema id="10" parent="1" name="test_db"/>
+    <schema id="11" parent="1" name="world"/>
+    <table id="12" parent="2" name="clients"/>
+    <table id="13" parent="2" name="groups"/>
+    <table id="14" parent="2" name="mod_skill"/>
+    <table id="15" parent="2" name="moderators"/>
+    <table id="16" parent="2" name="project_mod_skill"/>
+    <table id="17" parent="2" name="project_skil_cat"/>
+    <table id="18" parent="2" name="projects"/>
+    <table id="19" parent="2" name="skil_cat"/>
+    <table id="20" parent="2" name="skil_list"/>
+    <table id="21" parent="2" name="skil_match"/>
+    <table id="22" parent="2" name="st_pr"/>
+    <table id="23" parent="2" name="students"/>
+    <table id="24" parent="2" name="students_skill"/>
+    <table id="25" parent="2" name="users"/>
+    <column id="26" parent="12" name="client_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="22" parent="7" name="cl_family">
+    <column id="27" parent="12" name="cl_family">
       <Position>2</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="23" parent="7" name="cl_first_name">
+    <column id="28" parent="12" name="cl_first_name">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="24" parent="7" name="cl_sec_name">
+    <column id="29" parent="12" name="cl_sec_name">
       <Position>4</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="25" parent="7" name="cl_password">
+    <column id="30" parent="12" name="cl_password">
       <Position>5</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="26" parent="7" name="phone_number">
+    <column id="31" parent="12" name="phone_number">
       <Position>6</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="27" parent="7" name="e_mail">
+    <column id="32" parent="12" name="e_mail">
       <Position>7</Position>
       <DataType>varchar(100)|0</DataType>
     </column>
-    <column id="28" parent="7" name="company">
+    <column id="33" parent="12" name="company">
       <Position>8</Position>
       <DataType>varchar(100)|0</DataType>
     </column>
-    <column id="29" parent="7" name="pos">
+    <column id="34" parent="12" name="pos">
       <Position>9</Position>
       <DataType>varchar(100)|0</DataType>
     </column>
-    <column id="30" parent="7" name="hometown">
+    <column id="35" parent="12" name="hometown">
       <Position>10</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="31" parent="7" name="birthdate">
+    <column id="36" parent="12" name="birthdate">
       <Position>11</Position>
       <DataType>varchar(100)|0</DataType>
     </column>
-    <column id="32" parent="7" name="first_in">
+    <column id="37" parent="12" name="first_in">
       <Position>12</Position>
       <DataType>int(5)|0</DataType>
     </column>
-    <key id="33" parent="7" name="PRIMARY">
+    <key id="38" parent="12" name="PRIMARY">
       <ColNames>client_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="34" parent="8" name="group_id">
+    <column id="39" parent="13" name="group_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="35" parent="8" name="group_name">
+    <column id="40" parent="13" name="group_name">
       <Position>2</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="36" parent="8" name="year">
+    <column id="41" parent="13" name="year">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <key id="37" parent="8" name="PRIMARY">
+    <key id="42" parent="13" name="PRIMARY">
       <ColNames>group_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="38" parent="9" name="mod_sk_id">
+    <column id="43" parent="14" name="mod_sk_id">
       <Position>1</Position>
       <DataType>varchar(10)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="39" parent="9" name="skill_id">
+    <column id="44" parent="14" name="skill_id">
       <Position>2</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="40" parent="9" name="mod_id">
+    <column id="45" parent="14" name="mod_id">
       <Position>3</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="41" parent="9" name="rating">
+    <column id="46" parent="14" name="rating">
       <Position>4</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <key id="42" parent="9" name="PRIMARY">
+    <key id="47" parent="14" name="PRIMARY">
       <ColNames>mod_sk_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="43" parent="10" name="mod_id">
+    <column id="48" parent="15" name="mod_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="44" parent="10" name="mod_family">
+    <column id="49" parent="15" name="mod_family">
       <Position>2</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="45" parent="10" name="mod_first_name">
+    <column id="50" parent="15" name="mod_first_name">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="46" parent="10" name="mod_sec_name">
+    <column id="51" parent="15" name="mod_sec_name">
       <Position>4</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="47" parent="10" name="mod_password">
+    <column id="52" parent="15" name="mod_password">
       <Position>5</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="48" parent="10" name="mod_birthdate">
+    <column id="53" parent="15" name="mod_birthdate">
       <Position>6</Position>
       <DataType>varchar(255)|0</DataType>
       <DefaultExpression>&apos;11.11.2011&apos;</DefaultExpression>
     </column>
-    <column id="49" parent="10" name="mod_email">
+    <column id="54" parent="15" name="mod_email">
       <Position>7</Position>
       <DataType>varchar(255)|0</DataType>
       <DefaultExpression>&apos;pochta@mail.ru&apos;</DefaultExpression>
     </column>
-    <column id="50" parent="10" name="mod_hometown">
+    <column id="55" parent="15" name="mod_hometown">
       <Position>8</Position>
       <DataType>varchar(255)|0</DataType>
       <DefaultExpression>&apos;Город&apos;</DefaultExpression>
     </column>
-    <column id="51" parent="10" name="mod_phone">
+    <column id="56" parent="15" name="mod_phone">
       <Position>9</Position>
       <DataType>varchar(255)|0</DataType>
       <DefaultExpression>&apos;0000000000&apos;</DefaultExpression>
     </column>
-    <column id="52" parent="10" name="first_in">
+    <column id="57" parent="15" name="first_in">
       <Position>10</Position>
       <DataType>int(5)|0</DataType>
     </column>
-    <key id="53" parent="10" name="PRIMARY">
+    <key id="58" parent="15" name="PRIMARY">
       <ColNames>mod_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="54" parent="11" name="project_id">
+    <column id="59" parent="16" name="project_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="55" parent="11" name="skil_id">
+    <column id="60" parent="16" name="skil_id">
       <Position>2</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="56" parent="11" name="slave_id">
+    <column id="61" parent="16" name="slave_id">
       <Position>3</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="57" parent="11" name="rating">
+    <column id="62" parent="16" name="rating">
       <Position>4</Position>
       <DataType>int(11)|0</DataType>
     </column>
-    <column id="58" parent="11" name="pms_id">
+    <column id="63" parent="16" name="pms_id">
       <Position>5</Position>
       <DataType>varchar(45)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="59" parent="11" name="skill_name">
+    <column id="64" parent="16" name="skill_name">
       <Position>6</Position>
       <DataType>varchar(100)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <key id="60" parent="11" name="PRIMARY">
+    <key id="65" parent="16" name="PRIMARY">
       <ColNames>pms_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="61" parent="12" name="project_id">
+    <column id="66" parent="17" name="project_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="62" parent="12" name="skil_cat_id">
+    <column id="67" parent="17" name="skil_cat_id">
       <Position>2</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="63" parent="12" name="pcs_id">
+    <column id="68" parent="17" name="pcs_id">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <key id="64" parent="12" name="PRIMARY">
+    <key id="69" parent="17" name="PRIMARY">
       <ColNames>pcs_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="65" parent="13" name="pr_id">
+    <column id="70" parent="18" name="pr_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
       <SequenceIdentity>1</SequenceIdentity>
     </column>
-    <column id="66" parent="13" name="title">
+    <column id="71" parent="18" name="title">
       <Position>2</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="67" parent="13" name="description">
+    <column id="72" parent="18" name="description">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="68" parent="13" name="date_of_creation">
+    <column id="73" parent="18" name="date_of_creation">
       <Position>4</Position>
       <DataType>timestamp|0</DataType>
       <NotNull>1</NotNull>
       <DefaultExpression>CURRENT_TIMESTAMP</DefaultExpression>
     </column>
-    <column id="69" parent="13" name="status">
+    <column id="74" parent="18" name="status">
       <Position>5</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="70" parent="13" name="date_of_ready">
+    <column id="75" parent="18" name="date_of_ready">
       <Position>6</Position>
       <DataType>date|0</DataType>
     </column>
-    <column id="71" parent="13" name="sum">
+    <column id="76" parent="18" name="sum">
       <Position>7</Position>
       <DataType>int(11)|0</DataType>
     </column>
-    <column id="72" parent="13" name="mod_id">
+    <column id="77" parent="18" name="mod_id">
       <Position>8</Position>
       <DataType>int(11)|0</DataType>
     </column>
-    <column id="73" parent="13" name="client_id">
+    <column id="78" parent="18" name="client_id">
       <Position>9</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="74" parent="13" name="jsondata">
+    <column id="79" parent="18" name="jsondata">
       <Position>10</Position>
       <DataType>varchar(255)|0</DataType>
       <DefaultExpression>&apos;[]&apos;</DefaultExpression>
     </column>
-    <index id="75" parent="13" name="FK_ffb6klvqmnwust69pdfgau69i">
+    <index id="80" parent="18" name="FK_ffb6klvqmnwust69pdfgau69i">
       <ColNames>client_id</ColNames>
     </index>
-    <index id="76" parent="13" name="pr_modFK_idx">
+    <index id="81" parent="18" name="pr_modFK_idx">
       <ColNames>mod_id</ColNames>
     </index>
-    <key id="77" parent="13" name="PRIMARY">
+    <key id="82" parent="18" name="PRIMARY">
       <ColNames>pr_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <foreign-key id="78" parent="13" name="pr_modFK">
+    <foreign-key id="83" parent="18" name="pr_modFK">
       <ColNames>mod_id</ColNames>
       <RefSchemaName>anketa</RefSchemaName>
       <RefTableName>moderators</RefTableName>
@@ -283,92 +288,92 @@
       <OnUpdate>no-action</OnUpdate>
       <OnDelete>no-action</OnDelete>
     </foreign-key>
-    <foreign-key id="79" parent="13" name="FK_ffb6klvqmnwust69pdfgau69i">
+    <foreign-key id="84" parent="18" name="FK_ffb6klvqmnwust69pdfgau69i">
       <ColNames>client_id</ColNames>
       <RefSchemaName>anketa</RefSchemaName>
       <RefTableName>clients</RefTableName>
       <RefColNames>client_id</RefColNames>
     </foreign-key>
-    <column id="80" parent="14" name="skil_cat_id">
+    <column id="85" parent="19" name="skil_cat_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="81" parent="14" name="skil_cat_name">
+    <column id="86" parent="19" name="skil_cat_name">
       <Position>2</Position>
       <DataType>varchar(100)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <key id="82" parent="14" name="PRIMARY">
+    <key id="87" parent="19" name="PRIMARY">
       <ColNames>skil_cat_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="83" parent="15" name="skil_id">
+    <column id="88" parent="20" name="skil_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="84" parent="15" name="skil_name">
+    <column id="89" parent="20" name="skil_name">
       <Position>2</Position>
       <DataType>varchar(100)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <key id="85" parent="15" name="PRIMARY">
+    <key id="90" parent="20" name="PRIMARY">
       <ColNames>skil_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="86" parent="16" name="skil_cat_id">
+    <column id="91" parent="21" name="skil_cat_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="87" parent="16" name="skil_id">
+    <column id="92" parent="21" name="skil_id">
       <Position>2</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="88" parent="16" name="match_id">
+    <column id="93" parent="21" name="match_id">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="89" parent="16" name="skill_name">
+    <column id="94" parent="21" name="skill_name">
       <Position>4</Position>
       <DataType>varchar(100)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <index id="90" parent="16" name="match_id">
+    <index id="95" parent="21" name="match_id">
       <ColNames>skil_cat_id
 skil_id</ColNames>
     </index>
-    <key id="91" parent="16" name="PRIMARY">
+    <key id="96" parent="21" name="PRIMARY">
       <ColNames>match_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="92" parent="17" name="id">
+    <column id="97" parent="22" name="id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="93" parent="17" name="st_id">
+    <column id="98" parent="22" name="st_id">
       <Position>2</Position>
       <DataType>int(11)|0</DataType>
     </column>
-    <column id="94" parent="17" name="pr_id">
+    <column id="99" parent="22" name="pr_id">
       <Position>3</Position>
       <DataType>int(11)|0</DataType>
     </column>
-    <index id="95" parent="17" name="prFK_idx">
+    <index id="100" parent="22" name="prFK_idx">
       <ColNames>pr_id</ColNames>
     </index>
-    <index id="96" parent="17" name="stFK_idx">
+    <index id="101" parent="22" name="stFK_idx">
       <ColNames>st_id</ColNames>
     </index>
-    <key id="97" parent="17" name="PRIMARY">
+    <key id="102" parent="22" name="PRIMARY">
       <ColNames>id</ColNames>
       <Primary>1</Primary>
     </key>
-    <foreign-key id="98" parent="17" name="stFK">
+    <foreign-key id="103" parent="22" name="stFK">
       <ColNames>st_id</ColNames>
       <RefSchemaName>anketa</RefSchemaName>
       <RefTableName>students</RefTableName>
@@ -376,7 +381,7 @@ skil_id</ColNames>
       <OnUpdate>no-action</OnUpdate>
       <OnDelete>no-action</OnDelete>
     </foreign-key>
-    <foreign-key id="99" parent="17" name="prFK">
+    <foreign-key id="104" parent="22" name="prFK">
       <ColNames>pr_id</ColNames>
       <RefSchemaName>anketa</RefSchemaName>
       <RefTableName>projects</RefTableName>
@@ -384,59 +389,59 @@ skil_id</ColNames>
       <OnUpdate>no-action</OnUpdate>
       <OnDelete>no-action</OnDelete>
     </foreign-key>
-    <column id="100" parent="18" name="students_id">
+    <column id="105" parent="23" name="students_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="101" parent="18" name="group_id">
+    <column id="106" parent="23" name="group_id">
       <Position>2</Position>
       <DataType>int(11)|0</DataType>
     </column>
-    <column id="102" parent="18" name="st_family">
+    <column id="107" parent="23" name="st_family">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="103" parent="18" name="st_first_name">
+    <column id="108" parent="23" name="st_first_name">
       <Position>4</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="104" parent="18" name="st_sec_name">
+    <column id="109" parent="23" name="st_sec_name">
       <Position>5</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="105" parent="18" name="st_pk_number">
+    <column id="110" parent="23" name="st_pk_number">
       <Position>6</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="106" parent="18" name="bithdate">
+    <column id="111" parent="23" name="bithdate">
       <Position>7</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="107" parent="18" name="phone_number">
+    <column id="112" parent="23" name="phone_number">
       <Position>8</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="108" parent="18" name="e_mail">
+    <column id="113" parent="23" name="e_mail">
       <Position>9</Position>
       <DataType>varchar(100)|0</DataType>
     </column>
-    <column id="109" parent="18" name="hometown">
+    <column id="114" parent="23" name="hometown">
       <Position>10</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="110" parent="18" name="first_in">
+    <column id="115" parent="23" name="first_in">
       <Position>11</Position>
       <DataType>int(5)|0</DataType>
     </column>
-    <index id="111" parent="18" name="stud_groupFK_idx">
+    <index id="116" parent="23" name="stud_groupFK_idx">
       <ColNames>group_id</ColNames>
     </index>
-    <key id="112" parent="18" name="PRIMARY">
+    <key id="117" parent="23" name="PRIMARY">
       <ColNames>students_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <foreign-key id="113" parent="18" name="stud_groupFK">
+    <foreign-key id="118" parent="23" name="stud_groupFK">
       <ColNames>group_id</ColNames>
       <RefSchemaName>anketa</RefSchemaName>
       <RefTableName>groups</RefTableName>
@@ -444,44 +449,44 @@ skil_id</ColNames>
       <OnUpdate>no-action</OnUpdate>
       <OnDelete>no-action</OnDelete>
     </foreign-key>
-    <column id="114" parent="19" name="st_sk_id">
+    <column id="119" parent="24" name="st_sk_id">
       <Position>1</Position>
       <DataType>varchar(10)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="115" parent="19" name="skill_id">
+    <column id="120" parent="24" name="skill_id">
       <Position>2</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="116" parent="19" name="stud_id">
+    <column id="121" parent="24" name="stud_id">
       <Position>3</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="117" parent="19" name="rating">
+    <column id="122" parent="24" name="rating">
       <Position>4</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <key id="118" parent="19" name="PRIMARY">
+    <key id="123" parent="24" name="PRIMARY">
       <ColNames>st_sk_id</ColNames>
       <Primary>1</Primary>
     </key>
-    <column id="119" parent="20" name="user_id">
+    <column id="124" parent="25" name="user_id">
       <Position>1</Position>
       <DataType>int(11)|0</DataType>
       <NotNull>1</NotNull>
     </column>
-    <column id="120" parent="20" name="user_login">
+    <column id="125" parent="25" name="user_login">
       <Position>2</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <column id="121" parent="20" name="user_password">
+    <column id="126" parent="25" name="user_password">
       <Position>3</Position>
       <DataType>varchar(45)|0</DataType>
     </column>
-    <key id="122" parent="20" name="PRIMARY">
+    <key id="127" parent="25" name="PRIMARY">
       <ColNames>user_id</ColNames>
       <Primary>1</Primary>
     </key>

File diff suppressed because it is too large
+ 559 - 315
.idea/workspace.xml


+ 1 - 1
AuthModule/src/main/java/Controller/LoginController.java

@@ -150,7 +150,7 @@ public class LoginController {
             return grList;
         }
     }
-    @RequestMapping(value = "/checkStudent", method = RequestMethod.GET)
+    @RequestMapping(value = "/checkStudent")
     public ModelAndView checkStudent(@ModelAttribute("studentLogin")  LoginUser student, RedirectAttributes redir){
         try {
             HashMap<Integer, StudentsEntity> studentAll = getStudentsMap();

+ 42 - 1
AuthModule/src/main/java/Controller/StudentMovController.java

@@ -9,6 +9,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.SessionAttributes;
 import org.springframework.web.servlet.ModelAndView;
 
+import javax.enterprise.inject.Model;
+
+import static DAOImplement.StudentDao.getStudentsProject;
 import static DAOImplement.StudentDao.updateStudent;
 
 /**
@@ -16,9 +19,10 @@ import static DAOImplement.StudentDao.updateStudent;
  */
 @Controller
 @SessionAttributes("Student")
+
 public class StudentMovController {
 
-    @RequestMapping(value = "/PCabinStudentControl")
+    @RequestMapping(value = "/PCabinStudentControlвв")
     public ModelAndView studentInNextViewChecker(@ModelAttribute("Student") StudentsEntity student) {
         ModelAndView studentFirstIn = new ModelAndView("inViews/firstInViews/studentFirstIn");
         studentFirstIn.addObject("Student", student);
@@ -37,4 +41,41 @@ public class StudentMovController {
             return new ModelAndView("otherViews/errorView");
         }
     }
+
+    @RequestMapping(value = "/PProfileStudent")
+    public ModelAndView safeStudentFuck (@ModelAttribute("Student") StudentsEntity student) {
+        ModelAndView mv = new ModelAndView("inViews/persCabViews/studentPersCab");
+        mv.addObject("Student", student);
+        return mv;
+    }
+
+
+
+    @RequestMapping(value="/PCabinStudentControl")
+    public ModelAndView studentsProject(@ModelAttribute("Student") StudentsEntity student) {
+        ModelAndView studProj = new ModelAndView("inViews/persCabViews/studentProjects");
+        studProj.addObject("projects", getStudentsProject(student));
+
+        return studProj;
+    }
+
+        @RequestMapping(value="/PStudentsProjects")
+        public ModelAndView studentsProjects(@ModelAttribute("Projects") StudentsEntity student){
+            ModelAndView studPro = new ModelAndView("inViews/persCabViews/studentProjects");
+            studPro.addObject("projects", getStudentsProject(student));
+
+            return studPro;
+
+    }
+
+    @RequestMapping(value = "/PMainWindowProject")
+    public ModelAndView windowProject (@ModelAttribute("Project") StudentsEntity student) {
+        ModelAndView windProj = new ModelAndView("inViews/persCabViews/mainWindowProject");
+        windProj.addObject("Project", student);
+        return windProj;
+    }
+
+
+
 }
+

+ 71 - 5
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css

@@ -1,4 +1,4 @@
-html {
+ html {
     position: relative;
     min-height: 100%;
     font-family: 'Roboto', sans-serif;
@@ -241,7 +241,7 @@ body > .container {
 
 @media (max-width: 767px) {
 
-    .nav-masthead{
+    .nav-masthead {
         float: none;
     }
 
@@ -255,10 +255,12 @@ body > .container {
         margin: 0 auto;
         margin-top: 100px;
     }
-    .nav-link{
+
+    .nav-link {
         margin-top: 10px;
     }
-    .login-block form select{
+
+    .login-block form select {
         width: 100%;
         height: 42px;
         box-sizing: border-box;
@@ -272,4 +274,68 @@ body > .container {
         background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
         background-size: 16px 80px;
     }
-}
+}
+
+    .header h1 {
+        color: darkblue !important;
+        font-size: 120%;
+        letter-spacing: 1px;
+    }
+    .shadow {
+        box-shadow:3px 3px 8px #636c72;
+        border-radius: 10px;
+        margin: 0px 10px;
+        font-size: 150%;
+    }
+    .table {
+        font-family: "Lucida Sans Unicode", "Lucida Grande", Sans-Serif;
+        font-size: 14px;
+        border-collapse: collapse;
+        text-align: center;
+    }
+    th, td {
+        border-style: solid;
+        border-width: 0 1px 1px 0;
+        border-color: white;
+    }
+    th{
+        color: midnightblue;
+        background: lightblue;
+    }
+    td {
+        background: #D8E6F3;
+    }
+ #wrap{
+     display: none;
+     opacity: 0.8;
+     position: fixed;
+     left: 0;
+     right: 0;
+     top: 0;
+     bottom: 0;
+     padding: 16px;
+     background-color: rgba(1, 1, 1, 0.725);
+     z-index: 100;
+     overflow: auto;
+ }
+
+ #window{
+     width: 400px;
+     height: 400px;
+     margin: 50px auto;
+     display: none;
+     background: #fff;
+     z-index: 200;
+     position: fixed;
+     left: 0;
+     right: 0;
+     top: 0;
+     bottom: 0;
+     padding: 16px;
+ }
+
+ .close{
+     margin-left: 364px;
+     cursor: pointer;
+ }
+

+ 112 - 0
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/mainWindowProject.jsp

@@ -0,0 +1,112 @@
+
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+
+
+<%--
+  Created by IntelliJ IDEA.
+  User: Вероника
+  Date: 03.04.2017
+  Time: 11:05
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+
+<head>
+    <title>My project</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+    <script
+            src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+    <script
+            src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+</head>
+
+<body>
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                ${Student.stFamily}
+                ${Student.stFirstName}
+                ${Student.stSecName}
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+
+<div class="wrapper">
+
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""> <a href="/PStudentsProjects">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с клиентом</a> </li>
+                        <li class=""><a href="#">Мои приглашения в проект</a> </li>
+                        <li class=""><a href="/PProfileStudent">Профиль</a> </li>
+                        <li class=""><a href="#">Сообщество</a> </li>
+                        <li class=""><a href="/">Выход</a> </li>
+                    </form>
+                </div>
+
+                <hr>
+
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Проектное меню</div>
+                        <li class=""> <a href="/PMainWindowProject">Информация</a></li>
+                        <div class="dropdown">   <li class="dropdown">
+                            <a href="#" data-toggle="dropdown" class="dropdown-toggle">
+                                Декомпозиция
+                                <b class="caret"></b>
+                            </a>                               <!--ИЗМЕНИ ВЫПАДАЮЩИЙ СПИСОООК-->
+                            <ul class="dropdown-menu">
+                                <li><a href="#">Задачи</a></li>
+                                <li><a href="#">Рассылка</a></li>
+                            </ul>
+                            </li>
+
+                            <li class=""><a href="#">Исполнение</a> </li>
+                            <li class=""><a href="#">Сборка</a> </li>
+                            <li class=""><a href="#">Сдача</a> </li>
+                        </div>
+                    </form>
+
+                </div>
+            </div>
+
+
+            <div class="col-lg-9 col-lg-push-3">
+
+            </div>
+        </div>
+    </div>
+</div>
+
+        <footer class="footer">
+            <div class="container">
+                <p class="text-muted">&copy;2017 Mephorce</p>
+            </div>
+        </footer>
+</body>
+
+</html>

+ 20 - 0
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/studentChangeInfo.jsp

@@ -0,0 +1,20 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Вероника
+  Date: 26.03.2017
+  Time: 19:41
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Student Info Change Page</title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+
+</body>
+</html>

+ 89 - 0
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/studentPersCab.jsp

@@ -0,0 +1,89 @@
+<%--
+  Created by IntelliJ IDEA.
+  User: Вероника
+  Date: 23.03.2017
+  Time: 23:41
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title> Personal Student Page </title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+<nav class="navbar navbar-default navbar-right">
+    <div class="container">
+
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+
+<div class="col-lg-12">
+
+<div class="navbar-header header">
+    <center>
+        <h1>
+          Персональная информация
+        </h1>
+    </center>
+    <hr>
+</div>
+</div>
+
+
+<div class="wrapper">
+<div class="container">
+<div class="row">
+<div class="col-lg-3 col-lg-pull-9">
+
+<div class="btn-group btn-group-vertical">
+<form>
+    <div class="sidebar-header alert alert-info ">Меню</div>
+    <li class=""><a href="/PStudentsProjects">Мои проекты</a></li>
+    <li class=""><a href="#">Чат с заказчиком</a></li>
+    <li class=""><a href="#">Мои приглашения в проекты</a></li>
+    <li class=""><a href="/PProfileStudent">Профиль</a></li>
+    <li class=""><a href="#">Сообщество</a></li>
+    <li class=""><a href="#">Выход</a></li>
+</form>
+</div>
+</div>
+
+<div class="col-lg-9 col-lg-push-3">
+
+<div class="personal-page-block">
+
+                <b>Фамилия:</b> ${Student.stFamily} <br>
+                <b>Имя:</b> ${Student.stFirstName} <br>
+                <b>Отчество:</b> ${Student.stSecName} <br>
+                <c:if test="${not empty Student.stBirthdate}">
+                    <b>Дата рождения:</b> ${Student.stBirthdate} <br>
+
+                <br>
+                <a href="/PStudentChangeInfo">Изменить</a>
+            </div>
+        </div>
+    </div>
+                    </div>
+
+                    </body>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+</html>

+ 120 - 0
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/studentProjects.jsp

@@ -0,0 +1,120 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+
+<%--
+
+  Created by IntelliJ IDEA.
+  User: Вероника
+  Date: 26.03.2017
+  Time: 19:37
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+
+<head>
+    <title> Personal Student Page </title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+
+
+</head>
+<body>
+
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                ${Student.stFamily}
+                ${Student.stFirstName}
+                ${Student.stSecName}
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+
+<div class="wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""> <a href="/PStudentsProjects">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с клиентом</a> </li>
+                        <li class=""><a href="#">Мои приглашения в проект</a> </li>
+                        <li class=""><a href="/PProfileStudent">Профиль</a> </li>
+                        <li class=""><a href="#">Сообщество</a> </li>
+                        <li class=""><a href="/">Выход</a> </li>
+                    </form>
+                </div>
+            </div>
+
+            <div class="col-lg-9 col-lg-push-3">
+                <form class="form-inline">
+                    <h4>Проектов</h4>
+                    <div class="shadow">
+                        <span class="badge badge-info">${fn:length(projects)}</span>
+                    </div>
+                </form>
+                <h5>Мои проекты</h5>
+                <table class="table table-striped">
+                    <thead>
+                    <tr>
+                        <th class="text-center">#</th>
+                        <th class="text-center">Название</th>
+                        <th class="text-center">Описание</th>
+                       <!-- <th class="text-center">Дата создания</th>
+                        <th class="text-center">Статус</th>
+                        <th class="text-center">Дата готовности</th>
+                        <th class="text-center">Сумма</th>
+                        <th class="text-center">Заказчик</th> -->
+                    </tr>
+                    </thead>
+
+                    <tbody id="prodReportTable">
+                    <c:forEach var="listValue" items="${projects}">
+                    <tr>
+                        <td class="text-center"><a href="/PMainWindowProject">${listValue.prId}</a></td>
+                        <td class="text-center"><a href="/PMainWindowProject">${listValue.title}</a></td>
+                        <td class="text-center"><a href="/PMainWindowProject">${listValue.description}</a></td>
+                        <!-- <td class="text-center">${listValue.dateOfCreation}</td>
+                        <td class="text-center">${listValue.status}</td>
+                        <td class="text-center">${listValue.dateOfReady}</td>
+                        <td class="text-center">${listValue.sum}</td> -->
+                    </tr>
+                    </c:forEach>
+
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </div>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+
+</html>
+
+

+ 1 - 2
AuthModule/src/main/webapp/WEB-INF/views/loginViews/studentBar.jsp

@@ -95,8 +95,7 @@
 
     <h1>Вход как Исполнитель</h1>
     <div id="output"></div>
-    <c:url value="checkStudent" var="checkStudentUrl" />
-    <form:form id="signUp" method="post" modelAttribute="studentLogin" action="${checkStudentUrl}">
+    <form:form id="signUp" method="post" modelAttribute="studentLogin" action="checkStudent">
     <fieldset>
         <form:select id="IdGroupPart" path="">
         </form:select>

+ 11 - 0
DBModule/DBModule.iml

@@ -10,6 +10,17 @@
         <deploymentDescriptor name="hibernate.cfg.xml" url="file://$MODULE_DIR$/src/main/resources/hibernate.cfg.xml" />
       </configuration>
     </facet>
+    <facet type="web" name="Web">
+      <configuration>
+        <webroots>
+          <root url="file://$MODULE_DIR$/src/main/webapp" relative="/" />
+        </webroots>
+        <sourceRoots>
+          <root url="file://$MODULE_DIR$/src/main/java" />
+          <root url="file://$MODULE_DIR$/src/main/resources" />
+        </sourceRoots>
+      </configuration>
+    </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
     <output url="file://$MODULE_DIR$/target/classes" />

+ 18 - 0
DBModule/src/main/java/DAOImplement/StudentDao.java

@@ -1,10 +1,13 @@
 package DAOImplement;
 
+import HibernateEntities.StPrEntity;
 import HibernateEntities.StudentsEntity;
+import HibernateEntities.ProjectsEntity;
 import org.hibernate.Interceptor;
 import org.hibernate.Session;
 import org.hibernate.query.Query;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
@@ -62,4 +65,19 @@ public class StudentDao {
         }
         return true;
     }
+    public static List<ProjectsEntity> getStudentsProject(StudentsEntity student) {
+        Session session = getSession();
+        Query query = session.createQuery("From StPrEntity where stId = :studentsId");
+        query.setParameter("studentsId", student.getStudentsId());
+        List<StPrEntity> res = query.list();
+        List<ProjectsEntity> resultOfQuery = new ArrayList<>();
+        Query queryOne = session.createQuery("From ProjectsEntity where prId = :projId");
+        for (StPrEntity stpr: res) {
+            queryOne.setParameter("projId", stpr.getPrId());
+            List<ProjectsEntity> resultTmp = queryOne.list();
+            resultOfQuery.add(resultTmp.get(0));
+        }
+        session.close();
+        return resultOfQuery;
+    }
 }

+ 24 - 4
DBModule/src/main/java/HibernateEntities/StPrEntity.java

@@ -1,9 +1,7 @@
 package HibernateEntities;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import javax.persistence.*;
+import java.util.Set;
 
 /**
  * Created by kinetik on 27.02.17.
@@ -12,6 +10,28 @@ import javax.persistence.Table;
 @Table(name = "st_pr", schema = "anketa", catalog = "")
 public class StPrEntity {
     private int id;
+    private Integer stId;
+    private Integer prId;
+
+    @Basic
+    @Column(name="st_id", nullable = false)
+    public Integer getStId() {
+        return stId;
+    }
+
+    public void setStId(Integer stId) {
+        this.stId = stId;
+    }
+
+    @Basic
+    @Column(name="pr_id", nullable = false)
+    public Integer getPrId() {
+        return prId;
+    }
+
+    public void setPrId(Integer prId) {
+        this.prId = prId;
+    }
 
     @Id
     @Column(name = "id", nullable = false)

+ 6 - 0
DBModule/src/main/resources/StPrEntity.hbm.xml

@@ -8,5 +8,11 @@
         <id name="id">
             <column name="id" sql-type="int(11)"/>
         </id>
+        <property name="stId">
+            <column name="st_id" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+        <property name="prId">
+            <column name="pr_id" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
     </class>
 </hibernate-mapping>

+ 1 - 1
DBModule/src/main/resources/hibernate.cfg.xml

@@ -7,7 +7,7 @@
       <property name="connection.url">jdbc:mysql://localhost:3306/anketa</property>
       <property name="connection.driver_class">com.mysql.jdbc.Driver</property>
       <property name="connection.username">root</property>
-      <property name="connection.password">root</property>
+      <property name="connection.password">admin</property>
       <property name="hibernate.dialect">org.hibernate.dialect.Oracle10gDialect</property>
       <property name="hibernate.connection.characterEncoding">UTF-8</property>