Browse Source

my almost ready programm.Misha ,help me with page Invite moderators .We need to make some invitation tto moderator by click on button .Front-end ready and I hope you can make some changes in DB and make invite to moderator

BelkinPetr 2 years ago
parent
commit
6e61d89bb3
27 changed files with 2921 additions and 706 deletions
  1. 39 0
      .idea/artifacts/DBModule_war_exploded.xml
  2. 1 0
      .idea/compiler.xml
  3. 4 4
      .idea/dataSources.local.xml
  4. 6 0
      .idea/dataSources.xml
  5. 119 122
      .idea/dataSources/92c07869-f0de-4821-ba4d-23dc56e0fded.xml
  6. 119 122
      .idea/dataSources/e66f3b80-d157-473d-b64a-69cd88715781.xml
  7. 10 0
      .idea/inspectionProfiles/Project_Default.xml
  8. 1423 367
      .idea/workspace.xml
  9. 33 0
      AuthModule/src/main/java/Controller/ClientMovController.java
  10. 155 0
      AuthModule/src/main/java/Controller/ProjectMovController.java
  11. 1 0
      AuthModule/src/main/java/ServiceEntites/AddInfEnt.java
  12. 7 0
      AuthModule/src/main/java/ServiceEntites/AddInvite.java
  13. 111 0
      AuthModule/src/main/java/ServiceEntites/AddProject.java
  14. 318 3
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css
  15. 24 0
      AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/table-style.css
  16. 79 0
      AuthModule/src/main/webapp/WEB-INF/js/Selection.js
  17. 9 0
      AuthModule/src/main/webapp/WEB-INF/js/jquery.tablesorter.min.js
  18. 52 0
      AuthModule/src/main/webapp/WEB-INF/views/CreateProjectViews/CrProject.jsp
  19. 104 0
      AuthModule/src/main/webapp/WEB-INF/views/CreateProjectViews/Invite.jsp
  20. 78 0
      AuthModule/src/main/webapp/WEB-INF/views/CreateProjectViews/Projects.jsp
  21. 85 66
      AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientPersCab.jsp
  22. 14 1
      DBModule/DBModule.iml
  23. 29 0
      DBModule/src/main/java/DAOImplement/AdminDao.java
  24. 67 0
      DBModule/src/main/java/DAOImplement/ProjectDao.java
  25. 26 13
      DBModule/src/main/java/HibernateEntities/ProjectsEntity.java
  26. 7 7
      DBModule/src/main/resources/ProjectsEntity.hbm.xml
  27. 1 1
      DBModule/src/main/resources/hibernate.cfg.xml

+ 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>

+ 1 - 0
.idea/compiler.xml

@@ -14,6 +14,7 @@
       <module name="AuthModule" target="1.7" />
       <module name="DBModule" target="1.7" />
       <module name="mephorce" target="1.7" />
+      <module name="ModuleManageIspol" target="1.5" />
       <module name="PCabinModule" target="1.7" />
       <module name="RegModule" target="1.7" />
     </bytecodeTargetLevel>

+ 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.40 ( Revision: 402933ef52cad9aa82624e80acbea46e3a701ce6 )">
         <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.40 ( Revision: 402933ef52cad9aa82624e80acbea46e3a701ce6 )">
         <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>

+ 6 - 0
.idea/dataSources.xml

@@ -32,6 +32,12 @@
       </driver-properties>
       <libraries>
         <library>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.40/mysql-connector-license.txt</url>
+        </library>
+        <library>
+          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.40/mysql-connector-java-5.1.40-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>

+ 119 - 122
.idea/dataSources/92c07869-f0de-4821-ba4d-23dc56e0fded.xml

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

+ 119 - 122
.idea/dataSources/e66f3b80-d157-473d-b64a-69cd88715781.xml

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

+ 10 - 0
.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,10 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="InjectedReferences" enabled="false" level="ERROR" enabled_by_default="false" />
+    <inspection_tool class="LoggerInitializedWithForeignClass" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
+      <option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
+    </inspection_tool>
+  </profile>
+</component>

File diff suppressed because it is too large
+ 1423 - 367
.idea/workspace.xml


+ 33 - 0
AuthModule/src/main/java/Controller/ClientMovController.java

@@ -3,6 +3,7 @@ package Controller;
 import HibernateEntities.ClientsEntity;
 import HibernateEntities.ProjectsEntity;
 import ServiceEntites.AddInfEnt;
+import ServiceEntites.AddProject;
 import ServiceEntites.SelectProject;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
@@ -13,8 +14,11 @@ import javax.enterprise.inject.Model;
 import java.util.ArrayList;
 import java.util.List;
 
+import static DAOImplement.ClientsDao.createNewClient;
 import static DAOImplement.ClientsDao.getClientProject;
 import static DAOImplement.ClientsDao.updateClient;
+import static DAOImplement.ProjectDao.createNewProject;
+import static ServiceEntites.AddProject.*;
 
 /**
  * Created by kinetik on 05.03.17.
@@ -81,4 +85,33 @@ public class ClientMovController {
             return new ModelAndView("otherViews/errorView");
         }
     }
+
+   /* @RequestMapping(value = "/goToProjectAppender")
+    public ModelAndView goToProject() {
+        ModelAndView Np = new ModelAndView("CreateProjectViews/CrProject");
+        Np.addObject("Adder", new AddProject());
+        return Np;
+    }
+    @RequestMapping(value = "/CreateProject")
+
+    public ModelAndView CreatenewProject(@ModelAttribute("projectsEntity") ProjectsEntity projectsEntity,
+    @ModelAttribute("Adder") AddProject addProject){
+        try{
+            projectsEntity.setTitle(addProject.getCltittle().trim());
+
+            projectsEntity.setClId(addProject.getClclId());
+
+            projectsEntity.setDescription(addProject.getCldescription().trim());
+            projectsEntity.setDateOfReady(addProject.getCldateOfReady());
+            projectsEntity.setSum(addProject.getClsum());
+            projectsEntity.setPrId(addProject.getClprId());
+            createNewProject(projectsEntity);
+            return new ModelAndView("CreateProjectViews:/CrProject");
+        } catch (Exception ex){
+            return new ModelAndView("otherViews/errorView");
+        }
+
+    }*/
+
+
 }

+ 155 - 0
AuthModule/src/main/java/Controller/ProjectMovController.java

@@ -0,0 +1,155 @@
+package Controller;
+
+import HibernateEntities.ClientsEntity;
+import HibernateEntities.ModeratorsEntity;
+import HibernateEntities.ProjectsEntity;
+import ServiceEntites.AddInvite;
+import ServiceEntites.AddProject;
+import ServiceEntites.LoginUser;
+import ServiceEntites.RegUser;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+
+import static DAOImplement.AdminDao.getAdminById;
+import static DAOImplement.AdminDao.getAdminByName;
+import static DAOImplement.AdminDao.getAdminList;
+import static DAOImplement.ClientsDao.checkIsClient;
+import static DAOImplement.ClientsDao.createNewClient;
+import static DAOImplement.ClientsDao.getClientProject;
+import static DAOImplement.ProjectDao.createNewProject;
+import static DAOImplement.ProjectDao.getProjectById;
+import static DAOImplement.ProjectDao.updateProject;
+import static DAOImplement.UsersDao.getUserNameList;
+
+/**
+ * Created by postgres on 03.04.2017.
+ */
+@Controller
+@SessionAttributes("Client")
+public class ProjectMovController {
+
+    ModelAndView mvCrProject =new ModelAndView("CreateProjectViews/CrProject");
+    ModelAndView mvProject =new ModelAndView("CreateProjectViews/Projects");
+    ModelAndView mvInvite = new ModelAndView("CreateProjectViews/Invite");
+    @RequestMapping(value="/goToProjectAppender")
+    public ModelAndView regProjectLink(){
+        ModelAndView mvCrProject =new ModelAndView("CreateProjectViews/CrProject");
+        mvCrProject.addObject("Adder", new AddProject());
+        return mvCrProject;
+    }
+    @RequestMapping(value="/CreateProject")
+    public ModelAndView regNewProject(@ModelAttribute("Adder") AddProject addProject,
+                                      @ModelAttribute("Client") ClientsEntity client){
+        mvCrProject = new ModelAndView("CreateProjectViews/CrProject");
+        boolean errors = false;
+        try {
+            if (addProject.getCltitle().trim().equals("")) {
+                mvCrProject.addObject("Tittle", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+            if (addProject.getCldescription().trim().equals("")) {
+                mvCrProject.addObject("Description", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+
+            if (addProject.getClstatus().trim().equals("")) {
+                mvCrProject.addObject("Status", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+            if (addProject.getCldateOfReady().equals("")) {
+                mvCrProject.addObject("DateOfReady", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+            if (addProject.getClsum().equals("")) {
+                mvCrProject.addObject("Sum", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+            if (addProject.getCldateOfCreation().equals("")) {
+                mvCrProject.addObject("DateOfCreation", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+            if (addProject.getCldateOfReady().equals("")) {
+                mvCrProject.addObject("DateOfReady", "Это поле обязательно для заполнения");
+                errors = true;
+            }
+            if (errors) {
+                return mvCrProject;
+            } else {
+                ProjectsEntity projectsEntity = new ProjectsEntity();
+                projectsEntity.setTitle(addProject.getCltitle().trim());
+                projectsEntity.setDescription(addProject.getCldescription().trim());
+                projectsEntity.setClId(client.getClientId());
+                projectsEntity.setStatus(addProject.getClstatus().trim());
+                projectsEntity.setDateOfCreation(addProject.getCldateOfCreation());
+                projectsEntity.setDateOfReady(addProject.getCldateOfReady());
+                projectsEntity.setSum(addProject.getClsum());
+                    createNewProject(projectsEntity);
+                    return new ModelAndView("redirect:/PCabinClient");
+                }
+        } catch (Exception ex) {
+            ModelAndView errorView = new ModelAndView("otherViews/errorView");
+            errorView.addObject("message", ex.toString());
+            return errorView;
+        }
+    }
+    @RequestMapping(value = "/goToProject")
+    public ModelAndView clientChangeProjectData(@ModelAttribute("Client") ClientsEntity client,
+                                                @RequestParam String prId) {
+        try {
+            ModelAndView clientchprdata = new ModelAndView("CreateProjectViews/Projects");
+            ProjectsEntity project = getProjectById(Integer.parseInt(prId));
+            AddProject addInfo = new AddProject(project);
+            clientchprdata.addObject("addInfo", new AddProject());
+            clientchprdata.addObject("Project", project);
+            return clientchprdata;
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+
+    @RequestMapping(value = "/loadModer", method = RequestMethod.GET)
+    @ResponseBody
+    public ModeratorsEntity loadModer(@RequestParam(value = "moderName", required = true) String moderName) throws IllegalStateException {
+        try {
+
+            ModeratorsEntity moder = getAdminByName(moderName);
+            return moder;
+        } catch (Exception ex) {
+            return null;
+        }
+    }
+
+    @RequestMapping(value = "/addInformProjectNew")
+    public ModelAndView updateClientInformation(@ModelAttribute("addInfo") AddProject addInf,
+                                                @RequestParam String prId) {
+        try {
+            ProjectsEntity projectsEntity = getProjectById(Integer.parseInt(prId));
+            projectsEntity.setTitle(addInf.getCltitle().trim());
+            projectsEntity.setDescription(addInf.getCldescription().trim());
+            projectsEntity.setDateOfCreation(addInf.getCldateOfCreation());
+            projectsEntity.setStatus(addInf.getClstatus().trim());
+            projectsEntity.setSum(addInf.getClsum());
+            projectsEntity.setDateOfReady(addInf.getCldateOfReady());
+            updateProject(projectsEntity);
+            return new ModelAndView("redirect:/PCabinClient");
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+
+    @RequestMapping(value = "/goToInvite")
+
+    public ModelAndView InvitePriglashenieGenerator(@ModelAttribute("Admin") ModeratorsEntity admin) {
+        try {
+            ModelAndView mvInvite= new ModelAndView("CreateProjectViews/Invite");
+            mvInvite.addObject("adminList", getAdminList());
+            return mvInvite;
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+
+    }
+
+

+ 1 - 0
AuthModule/src/main/java/ServiceEntites/AddInfEnt.java

@@ -11,6 +11,7 @@ public class AddInfEnt {
     private String company;
     private String position;
 
+
     public String getBirthdate() {
         return birthdate;
     }

+ 7 - 0
AuthModule/src/main/java/ServiceEntites/AddInvite.java

@@ -0,0 +1,7 @@
+package ServiceEntites;
+
+/**
+ * Created by postgres on 24.05.2017.
+ */
+public class AddInvite {
+}

+ 111 - 0
AuthModule/src/main/java/ServiceEntites/AddProject.java

@@ -0,0 +1,111 @@
+package ServiceEntites;
+
+import HibernateEntities.ProjectsEntity;
+
+import java.sql.Date;
+import java.sql.Time;
+import java.sql.Timestamp;
+
+/**
+ * Created by postgres on 23.03.2017.
+ */
+public class AddProject {
+    private int clprId;
+    private String cltitle;
+    private String cldescription;
+    private String clstatus;
+    private Date cldateOfReady;
+    private Timestamp cldateOfCreation;
+    private int clsum;
+    private String jsondata;
+    private Integer clclId;
+
+    public AddProject(ProjectsEntity project){
+        this.cldateOfCreation = project.getDateOfCreation();
+        this.clprId = project.getPrId();
+        this.cltitle = project.getTitle();
+        this.cldescription = project.getDescription();
+        this.clstatus = project.getStatus();
+        this.cldateOfReady = project.getDateOfReady();
+        this.clsum = project.getSum();
+        this.jsondata = project.getJsondata();
+        this.clclId = project.getClId();
+    }
+
+    public AddProject(){
+
+    }
+
+    public Timestamp getCldateOfCreation() {
+        return cldateOfCreation;
+    }
+    public void setCldateOfCreation(Timestamp cldateOfCreation) {
+        this.cldateOfCreation=cldateOfCreation;
+    }
+    public int getClprId() {
+        return clprId;
+    }
+
+    public void setClprId(int clprId) {
+        this.clprId = clprId;
+    }
+
+    public String getCltitle() {
+        return cltitle;
+    }
+
+    public void setCltitle(String cltitle) {
+        this.cltitle = cltitle;
+    }
+
+    public String getCldescription() {
+        return cldescription;
+    }
+
+    public void setCldescription(String cldescription) {
+        this.cldescription = cldescription;
+    }
+
+    public String getClstatus() {
+        return clstatus;
+    }
+
+    public void setClstatus(String clstatus) {
+        this.clstatus = clstatus;
+    }
+
+    public Date getCldateOfReady() {
+        return cldateOfReady;
+    }
+
+    public void setCldateOfReady(Date cldateOfReady) {
+        this.cldateOfReady = cldateOfReady;
+    }
+
+    public Integer getClsum() {
+        return clsum;
+    }
+
+    public void setClsum(Integer clsum) {
+        this.clsum = clsum;
+    }
+
+    public String getJsondata() {
+        return jsondata;
+    }
+
+    public void setJsondata(String jsondata) {
+        this.jsondata = jsondata;
+    }
+
+    public Integer getClclId() {
+        return clclId;
+    }
+
+    public void setClclId(Integer clclId) {
+        this.clclId = clclId;
+    }
+}
+
+
+

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

@@ -9,6 +9,7 @@ body {
     margin-bottom: 60px;
     max-width: 100%;
     overflow-x: hidden;
+    font-size: 14px;
 }
 
 .cf {
@@ -29,6 +30,21 @@ body {
 .navbar {
     border-bottom: 1px solid #063971;
     background-color: #eceeef;
+    padding-bottom: 5px;
+
+}
+
+.navbar-fixed-top a {
+    font-size: 16px;
+}
+
+.nav-link {
+    line-height: 29px;
+}
+
+.navbar-fixed-top a.navbar-brand {
+    font-size: 20px;
+    color: #063971;
 }
 
 .navbar-brand{
@@ -37,6 +53,15 @@ body {
 
 .nav-masthead{
     float: right;
+
+}
+#moder{
+    color:darkblue ;
+    text-align: center;
+    font-size: 15px;
+ }
+.h2,h2{
+    color:darkblue ;
 }
 
 .nav-masthead a{
@@ -50,6 +75,7 @@ body {
     height: 25px;
     background-color: #f5f5f5;
     text-align: center;
+    font-size: 14px;
 }
 
 body > .container {
@@ -150,6 +176,21 @@ body > .container {
     background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
     background-size: 16px 80px;
 }
+#button{
+    width: 100%;
+    height: 40px;
+    background: #063971;
+    box-sizing: border-box;
+    border-radius: 5px;
+    border: 1px solid #063971;
+    color: #fff;
+    font-weight: bold;
+    text-transform: uppercase;
+    font-size: 14px;
+    outline: none;
+    cursor: pointer;
+
+}
 
 .login-block form select option {
     align-items: center;
@@ -241,7 +282,7 @@ body > .container {
 
 @media (max-width: 767px) {
 
-    .nav-masthead{
+    .nav-masthead {
         float: none;
     }
 
@@ -255,10 +296,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 +315,276 @@ 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;
+}
+#invite {
+    border-width: 0px;
+    position: absolute;
+    left: 190px;
+    top: -85px;
+    width: 773px;
+    height: 461px;
+    background: inherit;
+    background-color: rgba(255, 255, 255, 1);
+    box-sizing: border-box;
+    border-width: 1px;
+    border-style: solid;
+    border-color: rgba(121, 121, 121, 1);
+    border-radius: 12px;
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}
+#u11 {
+    border-width: 0px;
+    position: absolute;
+    left: 29px;
+    top: 44px;
+    width: 773px;
+    height: 10px;
+}
+
+#prigl {
+    left: 0px;
+    top: 0px;
+    width: 283px;
+    height: 156px;
+    font-family: "Arial Обычный","Arial";
+    font-weight: 400;
+    font-style: normal;
+    font-size: 13px;
+    text-decoration: none;
+    color: #000000;
+    background: white;
+}
+#u16 {
+    border-width: 0px;
+    position: absolute;
+    left: 323px;
+    top: 403px;
+    width: 140px;
+    height: 40px;
+}
+#u18 {
+    border-width: 0px;
+    position: absolute;
+    left: 323px;
+    top: 145px;
+    width: 136px;
+    word-wrap: break-word;
+}
+
+#u11_div {
+    border-width: 0px;
+    position: absolute;
+    left: -30px;
+    top: -45px;
+    width: 773px;
+    height: 10px;
+    background: inherit;
+    background-color: rgba(6, 57, 113, 1);
+    box-sizing: border-box;
+    border-width: 1px;
+    border-style: solid;
+    border-color: rgba(121, 121, 121, 1);
+    border-radius: 0px;
+    -moz-box-shadow: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+}
+
+#textfield_input {
+    position: absolute;
+    left: -30px;
+    top: -38px;
+    width: 358px;
+    height: 104px;
+    font-family: "Arial Обычный","Arial";
+    font-weight: 400;
+    font-style: normal;
+    font-size: 13px;
+    text-decoration: none;
+    color: #000000;
+    text-align: left;
+    background: white;
+}
+
+
+.login-block textarea#description {
+    width: 360px;
+    height: 100px;
+    background: white;
+}
+#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;
+}
+
+.project-table {
+    width: 90%;
+}
+
+.user-info-and-menu {
+    padding-left: 5%;
+    font-size: 14px;
+}
+
+.projectmenu {
+    width: 150%;
+}
+.sidebar-header{
+    width: 300px;
+}
+.btn-group {
+    list-style-type: none;
+    margin-left: 0;
+    padding-left: 0;
+}
+.wind {
+    width: 300px;
+}
+.choose{
+    display: none;
+}
+.redex{
+    resize: none;
+    width: 300px;
+}
+#u10 {
+    border-width: 0px;
+    position: absolute;
+    left: 0px;
+    top: 0px;
+    width: 97px;
+    white-space: nowrap;
+}
+
+#boxright{
+    border-width: 0px;
+    position: absolute;
+    left: 503px;
+    top: 127px;
+    width: 279px;
+    height: 147px;
+}
+#textfield {
+    border-width: 0px;
+    position: absolute;
+    left: 222px;
+    top: 320px;
+    width: 358px;
+    height: 104px;
+}
+#boxright_input {
+    position: absolute;
+    left: -28px;
+    top: -39px;
+    width: 279px;
+    height: 155px;
+    font-family: "Arial Обычный","Arial";
+    font-weight: 400;
+    font-style: normal;
+    font-size: 13px;
+    text-decoration: none;
+    color: #000000;
+    text-align: left;
+    background: white;
+}
+#selector {
+    font-size: 13px;
+}
+#u14 {
+    border-width: 0px;
+    position: absolute;
+    left: 579px;
+    top: 64px;
+    width: 94px;
+    white-space: nowrap;
+    font-size: 14px;
+    font-weight: 800;
+}
+#u8 {
+    border-width: 0px;
+    position: absolute;
+    left: 231px;
+    top: 260px;
+    width: 80px;
+    word-wrap: break-word;
+    font-size: 14px;
+    font-weight: 800;
+}
+
+#u10 {
+    border-width: 0px;
+    position: absolute;
+    left: 127px;
+    top: 65px;
+    width: 97px;
+    font-family: "Arial Обычный","Arial";
+    font-weight: 800;
+    font-style: normal;
+    font-size: 13px;
+    white-space: nowrap;
 }

+ 24 - 0
AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/table-style.css

@@ -0,0 +1,24 @@
+
+
+table.tablesorter thead tr  .header {
+	background-image: url(http://tablesorter.com/themes/blue/bg.gif);
+	background-repeat: no-repeat;
+	background-position: center right;
+	cursor: pointer;
+}
+
+
+table.tablesorter thead tr .headerSortUp {
+	background-image: url(http://tablesorter.com/themes/blue/asc.gif);
+}
+table.tablesorter thead tr .headerSortDown {
+	background-image: url(http://tablesorter.com/themes/blue/desc.gif);
+}
+
+.table-responsive {
+	height: 75vh;
+}
+
+.cell{
+	height: 80px;
+}

+ 79 - 0
AuthModule/src/main/webapp/WEB-INF/js/Selection.js

@@ -0,0 +1,79 @@
+/**
+ * Created by postgres on 24.05.2017.
+ */
+$(document).ready(function(){
+var arrData=[];
+    // code to read selected table row cell data (values).
+    $("#myTable").on('click','.btnSelect',function(){
+        // get the current row
+        var currentRow=$(this).closest("tr");
+
+        var col1=currentRow.find("td:eq(1)").text(); // get current row 1st TD value
+        var col2=currentRow.find("td:eq(2)").text(); // get current row 2nd TD
+        var col3=currentRow.find("td:eq(3)").text();
+        var col4=currentRow.find("td:eq(4)").text();
+        var col5=currentRow.find("td:eq(5)").text();
+        var col6=currentRow.find("td:eq(6)").text();// get current row 3rd TD
+        var data=col1+"\n"+col2+"\n"+col3+"\n"+col4+"\n"+col5+"\n"+col6;
+
+        alert(data);
+        var obj={};
+        obj.col1_value=col1;
+        obj.col2_value=col2;
+        obj.col3_value=col3;
+        obj.col4_value=col4;
+        obj.col5_value=col5;
+        obj.col6_value=col6;
+        arrData.push(obj);
+        sessionStorage.setItem('dannye',arrData);
+    });
+    console.log(arrData);
+    $('#get').on('click',function () {
+        var dannye = sessionStorage.getItem('dannye');
+        alert(dannye);
+
+    });
+});
+
+function testJS() {
+    var b = document.getElementById('tittle').value,
+        url = 'http://localhost:8080/goToProject?tittle=.....' + encodeURIComponent(b);
+
+    document.location.href = url;
+}
+window.onload = function () {
+    var url = document.location.href,
+        params = url.split('?')[1].split('&'),
+        data = {}, tmp;
+    for (var i = 0, l = params.length; i < l; i++) {
+        tmp = params[i].split('=');
+        data[tmp[0]] = tmp[1];
+    }
+    document.getElementById('here').innerHTML = data.name;
+}
+
+
+/**     $(document).ready(function() {
+            $('#prigl').change(
+                function() {
+                    $.getJSON('{getModer}', {
+                        moderName : $(this).val(),
+                        ajax : 'true'
+                    }, function(data) {
+                        var html = '{data.modFamily}';
+                        html += '<br>';
+                        $('#textfield_input').html(html);
+                    });
+                });
+        });**/
+/*$( "input" )
+    .keyup(function() {
+        var value = $( this ).val();
+        $( "p" ).text( value );
+    })
+    .keyup();*/
+function changeFunc() {
+    var selectBox = document.getElementById("prigl");
+    var selectedValue = selectBox.options[selectBox.selectedIndex].value;
+    alert(selectedValue);
+}

File diff suppressed because it is too large
+ 9 - 0
AuthModule/src/main/webapp/WEB-INF/js/jquery.tablesorter.min.js


+ 52 - 0
AuthModule/src/main/webapp/WEB-INF/views/CreateProjectViews/CrProject.jsp

@@ -0,0 +1,52 @@
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Создание проекта</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="container">
+    <div class="login-block">
+        <form:form method="post"  modelAttribute="Adder" action="/CreateProject">
+            <h1>Создание проекта</h1>
+            <form:input path="cltitle" type="text" value="" placeholder="Название" />${Tittle}   <br/>
+            <form:textarea path="cldescription" id="description" value="" placeholder="Описание"/>${Description}   <br/>
+            <form:input path="cldateOfCreation" type="text" value="" placeholder="Дата начала"/>${DateOfCreation}   <br/>
+            <form:input path="cldateOfReady" type="text" value="" placeholder="Дата завершения"/>${DateOfReady}   <br/>
+            <form:input path="clstatus" type="text" value="" placeholder="Статус"/>${Status}   <br/>
+            <form:input path="clsum" type="text" value="" placeholder="Сумма"/>${Sum}   <br/>
+            ${errMessage}<br/>
+            <form:button>Создать</form:button>
+        </form:form>
+    </div>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <span>&copy;2017 Mephorce</span>
+    </div>
+</footer>
+
+</body>
+</html>

+ 104 - 0
AuthModule/src/main/webapp/WEB-INF/views/CreateProjectViews/Invite.jsp

@@ -0,0 +1,104 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: kinetik
+  Date: 06.03.17
+  Time: 18:56
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Administrator Info Change Page</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
+          integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+
+    <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" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/table-style.css" %>
+    </style>
+
+
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"
+            integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
+            crossorigin="anonymous"></script>
+    <script type="text/javascript" >
+        <%@include file="/WEB-INF/js/Selection.js" %>
+    </script>
+  <c:url var="getModer" value="/loadModer" />
+</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="container">
+    <div class="login-block" id="invite">
+        <h1> Приглашение модераторов </h1>
+        </br>
+        </br>
+        <form name="form1"  method="post">
+            <div class="ax_default box_1" id="u11">
+                <div id="u11_div"></div>
+                <!-- Unnamed () -->
+                <div class="text" id="u12" style="display:none; visibility: hidden">
+                    <p><span></span></p>
+                </div>
+            </div>
+            <div class="text" id="u10">
+                <p><span>Модераторы</span></p>
+            </div>
+       <div class="list-block">
+           <select id="prigl" onchange="changeFunc();" size="2">
+                   <c:forEach var="listValue1" items="${adminList}">
+                       <option value="${listValue1}" id="selector">${listValue1}</option>
+                   </c:forEach>
+           </select>
+       </div>
+            <div class="text">
+                <button id="u18" onclick="showInput();">&gt;&gt;</button>
+            </div>
+            <div class="text" id="u14">
+                <p><span>Выбранные</span></p>
+            </div>
+            <div class="simpletextarea" id="boxright">
+                <input id="boxright_input" style="color: rgba(153,153,153,1);" type="text" value="" />
+            </div>
+            <div class="textfield" id="textfield">
+                <textarea id="textfield_input" style="color:rgba(153,153,153,1);" type="text" value=""/>
+
+            </div>
+            <div class="ax_default primary_button" id="u15">
+                <div id="u15_div"></div>
+                <!-- Unnamed () -->
+                <div class="text">
+                    <button id="u16">Послать приглашение</button>
+                </div>
+                <div class="text" id="u8">
+                    <p><span>Профиль</span></p>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+</html>

+ 78 - 0
AuthModule/src/main/webapp/WEB-INF/views/CreateProjectViews/Projects.jsp

@@ -0,0 +1,78 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: kinetik
+  Date: 06.03.17
+  Time: 18:56
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Administrator Info Change Page</title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
+          integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+
+    <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" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/table-style.css" %>
+    </style>
+
+
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"
+            integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
+            crossorigin="anonymous"></script>
+    <script type="text/javascript" >
+        <%@include file="/WEB-INF/js/Selection.js" %>
+    </script>
+</head>
+<body>
+<%
+    String Uname=request.getParameter("title");
+    String Usecret=request.getParameter("password");
+    out.println(Uname);
+    out.println(Usecret);
+%>
+
+<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="container">
+    <div class="login-block">
+        <h1> Редактирование проекта </h1>
+         </br>
+        </br>
+        <form:form  name="form1" action="/addInformProjectNew?prId=${Project.prId}" method="post" modelAttribute="addInfo">
+            <form:input path="cltitle" id="here" type="text" value="${Project.title}" placeholder="${Project.title}"/><br/>
+            <form:input path="cldescription" id="description"  value="${Project.description}" placeholder="${Project.description}" /> <br/>
+            <form:input path="cldateOfCreation" type="text" value="${Project.dateOfCreation}" placeholder="${Project.dateOfCreation}"/>  <br/>
+            <form:input path="cldateOfReady" type="text" value="${Project.dateOfReady}" placeholder="${Project.dateOfReady}"/>   <br/>
+            <form:input path="clstatus" type="text" value="${Project.status}" placeholder="${Project.status}"/>   <br/>
+            <form:input path="clsum" type="text" value="${Project.sum}" placeholder="${Project.sum}"/>   <br/>
+            <br/>
+            <p><form:button id="button" value=" Изменить ">Изменить</form:button></p>
+            <p><a href="/goToInvite"> Пригласить модераторов в проект  </a></p>
+            <p><a href="#"> Прикрепить файл </a></p>
+        </form:form>
+    </div>
+</div>
+
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+
+</body>
+</html>

+ 85 - 66
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientPersCab.jsp

@@ -1,106 +1,125 @@
 <%@ 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: kinetik
-  Date: 05.03.17
-  Time: 22:08
+  User: Александр
+  Date: 26.03.2017
+  Time: 15:07
   To change this template use File | Settings | File Templates.
 --%>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
-
 <head>
     <title> Personal Client Page </title>
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css"
+          integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+
     <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" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/table-style.css" %>
     </style>
-</head>
 
+
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"
+            integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa"
+            crossorigin="anonymous"></script>
+    <script type="text/javascript" >
+        <%@include file="/WEB-INF/js/jquery.tablesorter.min.js" %>
+    </script>
+    <script type="text/javascript" >
+        <%@include file="/WEB-INF/js/Selection.js" %>
+    </script>
+</head>
+<body>
 <nav class="navbar navbar-default navbar-fixed-top">
     <div class="container">
-        <a class="navbar-brand" href="#">MePhorce</a>
+        <a class="navbar-brand" href="/">MePhorce</a>
         <nav class="nav nav-masthead">
-            <a class="nav-link active" href="/">Войти</a>
             <a class="nav-link" href="/aboutUs">О проекте</a>
-            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown">Создать аккаунт</a>
+                <ul class="dropdown-menu inverse">
+                    <li><a href="regStudent">Исполнитель</a></li>
+                    <li><a href="regAdmin">Администратор</a></li>
+                    <li><a href="regClient">Заказчик</a></li>
+                </ul>
+            </li>
             <a class="nav-link" href="/contacts">Контакты</a>
+            <a class="nav-link active" href="/">Выйти</a>
         </nav>
     </div>
 </nav>
 
 <div class="row">
-    <div class="col-sm-1">
-    </div>
-    <div class="col-sm-3">
-        <div class="container">
-            <div class="personal-page-block">
-                <h1> Персональная информация </h1>
-                <b>Фамилия:</b> ${Client.clFamily} <br>
-                <b>Имя:</b> ${Client.clFirstName} <br>
-                <b>Отчество:</b> ${Client.clSecName} <br>
-                <c:if test="${not empty Client.clBirthdate}">
-                    <b>Дата рождения:</b> ${Client.clBirthdate} <br>
-                </c:if>
-                <c:if test="${not empty Client.clCompany}">
-                    <b>Компания:</b> ${Client.clCompany}<br>
-                </c:if>
-                <c:if test="${not empty Client.clPos}">
-                    <b>Должность:</b> ${Client.clPos} <br>
-                </c:if>
-                <c:if test="${not empty Client.clPhone}">
-                    <b>Номер телефона:</b> ${Client.clPhone} <br>
-                </c:if>
-                <c:if test="${not empty Client.clEmail}">
-                    <b>E-mail адрес:</b> ${Client.clEmail} <br>
-                </c:if>
-                <c:if test="${not empty Client.clHometown}">
-                    <b>Город:</b> ${Client.clHometown} <br>
-                </c:if>
-                <br>
-                <a href="/PClientChangeInfo">Изменить</a>
+    <div class="col-md-3">
+        <div class="user-info-and-menu">
+            <div class="navbar-header header">
+                <h1>
+                    ${Client.clFamily}
+                    ${Client.clFirstName}
+                    ${Client.clSecName}
+                </h1>
+                <hr>
+            </div>
+            <div class="btn-group btn-group-vertical">
+                <form>
+                    <div class="sidebar-header alert alert-info ">Меню</div>
+                    <li class=""><a href="/PCabinAdmin">Профиль</a></li>
+                    <li class=""><a href="/goToProjectAppender">Новый проект</a> </li>
+                    <li class=""><a href="#">Чат с модератором</a> </li>
+                    <li class=""><a href="#">Сообщество</a> </li>
+                </form>
             </div>
         </div>
     </div>
-    <div class="col-sm-2">
-    </div>
-    <div class="col-sm-4">
-        <div class="container">
-            <div class="projects-block">
-                <h1>Проекты</h1>
-                <c:if test="${not empty projectList}">
-                    <table>
-                        <thead>
-                        <tr>
-                            <th>Имя проекта</th>
-                            <th>Статус</th>
+    <div class="col-md-9">
+        <div class="project-table">
+            <h2>Мои проекты</h2>
+            <div class="table-responsive">
+                <form name="form1" action="/goToProject" method="get">
+                <table class="table table-striped tablesorter"  id="myTable" >
+                    <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>
+                    </thead>
+                    <tbody id="prodReportTable" >
+                    <c:forEach var="listValue" items="${projectList}">
+                        <tr >
+                            <td class="text-center"><a href="goToProject?prId=${listValue.prId}">${listValue.prId}</a></td>
+                            <td class="text-center" id="tittle"><a href="goToProject?prId=${listValue.prId}" id="get">${listValue.title}</a></td>
+                            <td class="text-center"><div class="table-responsive cell">${listValue.description}</div></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>
+                            <td><button class="btnSelect" id="print" value="go" onClick="testJS()">Select</button></td>
                         </tr>
-                        </thead>
-                        <tbody id="prodReportTable">
-                        <c:forEach var="listValue" items="${projectList}">
-                            <tr>
-                                <td><a href="#">${listValue.title}</a></td>
-                                <td>${listValue.status}</td>
-                            </tr>
-                        </c:forEach>
-                        </tbody>
-                    </table>
-                </c:if>
+                    </c:forEach>
+                    </tbody>
+                </table>
+                </form>
             </div>
         </div>
     </div>
-    <div class="col-sm-2">
-    </div>
 </div>
-
-<br><br>
-
+<div class="container" id="moder">
+<div class="row">
+    <p align="center"><a href="#">Выбор модератора под проект</a></p>
+</div>
+</div>
 <footer class="footer">
     <div class="container">
         <p class="text-muted">&copy;2017 Mephorce</p>
     </div>
 </footer>
-
 </body>
 </html>

+ 14 - 1
DBModule/DBModule.iml

@@ -6,10 +6,23 @@
         <datasource-map>
           <unit-entry name="hibernate.cfg.xml" value="e66f3b80-d157-473d-b64a-69cd88715781" />
         </datasource-map>
-        <naming-strategy-map />
+        <naming-strategy-map>
+          <unit-entry name="hibernate.cfg.xml" />
+        </naming-strategy-map>
         <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" />

+ 29 - 0
DBModule/src/main/java/DAOImplement/AdminDao.java

@@ -1,6 +1,9 @@
 package DAOImplement;
 
+import HibernateEntities.ClientsEntity;
 import HibernateEntities.ModeratorsEntity;
+import HibernateEntities.ProjectsEntity;