Browse Source

Small changes in structure

kinetik 5 years ago
parent
commit
049a67ebca
62 changed files with 353 additions and 17110 deletions
  1. 0 39
      .idea/artifacts/DBModule_war_exploded.xml
  2. 0 8
      .idea/artifacts/PCabinModule_war.xml
  3. 0 69
      .idea/artifacts/PCabinModule_war_exploded.xml
  4. 0 13
      .idea/artifacts/PCabinModule_war_exploded2.xml
  5. 0 8
      .idea/artifacts/RegModule_war.xml
  6. 0 68
      .idea/artifacts/RegModule_war_exploded.xml
  7. 160 100
      .idea/dataSources/92c07869-f0de-4821-ba4d-23dc56e0fded.xml
  8. 154 285
      .idea/workspace.xml
  9. 5 0
      AuthModule/pom.xml
  10. 34 0
      AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp
  11. 0 5
      AuthModule/target/AuthModule/META-INF/MANIFEST.MF
  12. 0 6
      AuthModule/target/AuthModule/WEB-INF/applicationContext.xml
  13. 0 1339
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css
  14. 0 1
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css.map
  15. 0 1
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css
  16. 0 1
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css.map
  17. 0 459
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css
  18. 0 1
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css.map
  19. 0 1
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css
  20. 0 1
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css.map
  21. 0 9320
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css
  22. 0 1
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css.map
  23. 0 6
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css
  24. 0 1
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css.map
  25. 0 275
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css
  26. 0 3535
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.js
  27. 0 7
      AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.min.js
  28. 0 32
      AuthModule/target/AuthModule/WEB-INF/dispatcher-servlet.xml
  29. 0 57
      AuthModule/target/AuthModule/WEB-INF/views/inViews/firstInViews/adminFirstIn.jsp
  30. 0 58
      AuthModule/target/AuthModule/WEB-INF/views/inViews/firstInViews/clientFirstIn.jsp
  31. 0 56
      AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp
  32. 0 63
      AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp
  33. 0 60
      AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/clientChangeInfo.jsp
  34. 0 106
      AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/clientPersCab.jsp
  35. 0 55
      AuthModule/target/AuthModule/WEB-INF/views/loginViews/adminBar.jsp
  36. 0 58
      AuthModule/target/AuthModule/WEB-INF/views/loginViews/index.jsp
  37. 0 55
      AuthModule/target/AuthModule/WEB-INF/views/loginViews/ownerBar.jsp
  38. 0 120
      AuthModule/target/AuthModule/WEB-INF/views/loginViews/studentBar.jsp
  39. 0 38
      AuthModule/target/AuthModule/WEB-INF/views/otherViews/aboutPage.jsp
  40. 0 45
      AuthModule/target/AuthModule/WEB-INF/views/otherViews/accessDeniedView.jsp
  41. 0 38
      AuthModule/target/AuthModule/WEB-INF/views/otherViews/contactPage.jsp
  42. 0 45
      AuthModule/target/AuthModule/WEB-INF/views/otherViews/errorView.jsp
  43. 0 57
      AuthModule/target/AuthModule/WEB-INF/views/registrationViews/regAdminPage.jsp
  44. 0 56
      AuthModule/target/AuthModule/WEB-INF/views/registrationViews/regClientPage.jsp
  45. 0 64
      AuthModule/target/AuthModule/WEB-INF/views/registrationViews/regStudentPage.jsp
  46. 0 50
      AuthModule/target/AuthModule/WEB-INF/views/registrationViews/registration.jsp
  47. 0 45
      AuthModule/target/AuthModule/WEB-INF/views/registrationViews/registrationSuccess.jsp
  48. 0 52
      AuthModule/target/AuthModule/WEB-INF/web.xml
  49. 0 11
      DBModule/DBModule.iml
  50. 0 45
      DBModule/target/classes/ClientsEntity.hbm.xml
  51. 0 18
      DBModule/target/classes/GroupsEntity.hbm.xml
  52. 0 39
      DBModule/target/classes/ModeratorsEntity.hbm.xml
  53. 0 23
      DBModule/target/classes/Project_mod_skillEntity.hbm.xml
  54. 0 17
      DBModule/target/classes/Project_skil_catEntity.hbm.xml
  55. 0 36
      DBModule/target/classes/ProjectsEntity.hbm.xml
  56. 0 14
      DBModule/target/classes/Skil_catEntity.hbm.xml
  57. 0 14
      DBModule/target/classes/Skil_listEntity.hbm.xml
  58. 0 17
      DBModule/target/classes/Skil_matchEntity.hbm.xml
  59. 0 12
      DBModule/target/classes/StPrEntity.hbm.xml
  60. 0 42
      DBModule/target/classes/StudentsEntity.hbm.xml
  61. 0 18
      DBModule/target/classes/UsersEntity.hbm.xml
  62. 0 44
      DBModule/target/classes/hibernate.cfg.xml

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

@@ -2,48 +2,9 @@
   <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>

+ 0 - 8
.idea/artifacts/PCabinModule_war.xml

@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="war" name="PCabinModule:war">
-    <output-path>$PROJECT_DIR$/PCabinModule/target</output-path>
-    <root id="archive" name="PCabinModule.war">
-      <element id="artifact" artifact-name="PCabinModule:war exploded" />
-    </root>
-  </artifact>
-</component>

+ 0 - 69
.idea/artifacts/PCabinModule_war_exploded.xml

@@ -1,69 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="exploded-war" name="PCabinModule:war exploded">
-    <output-path>$PROJECT_DIR$/PCabinModule/target/PCabinModule</output-path>
-    <root id="root">
-      <element id="directory" name="WEB-INF">
-        <element id="directory" name="classes">
-          <element id="module-output" name="PCabinModule" />
-        </element>
-        <element id="directory" name="lib">
-          <element id="archive" name="DBModule-1.0.jar">
-            <element id="module-output" name="DBModule" />
-          </element>
-          <element id="library" level="project" name="Maven: org.hibernate:antlr:2.7.5H3" />
-          <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: mysql:mysql-connector-java:5.1.40" />
-          <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.springframework:spring-webmvc:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-web:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-context:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-core:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.2" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.biins:spring-commons:1.0.0" />
-          <element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.7" />
-          <element id="library" level="project" name="Maven: jstl:jstl:1.2" />
-          <element id="library" level="project" name="Maven: li.rudin.mavenjs:ajax-utils:1.0" />
-          <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: org.springframework:spring-jdbc:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc-portlet:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-websocket:4.3.6.RELEASE" />
-          <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.webjars:jquery:3.1.1" />
-          <element id="library" level="project" name="Maven: com.efsavage.jquery:jquery-maven:1.8.2" />
-          <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 id="library" level="project" name="Maven: javax.servlet:javax.servlet-api:3.1.0" />
-        </element>
-      </element>
-      <element id="directory" name="META-INF">
-        <element id="file-copy" path="$PROJECT_DIR$/PCabinModule/target/PCabinModule/META-INF/MANIFEST.MF" />
-      </element>
-      <element id="javaee-facet-resources" facet="PCabinModule/web/Web" />
-    </root>
-  </artifact>
-</component>

+ 0 - 13
.idea/artifacts/PCabinModule_war_exploded2.xml

@@ -1,13 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="exploded-war" name="PCabinModule:war exploded2">
-    <output-path>$PROJECT_DIR$/out/artifacts/PCabinModule_war_exploded2</output-path>
-    <root id="root">
-      <element id="javaee-facet-resources" facet="PCabinModule/web/Web" />
-      <element id="directory" name="WEB-INF">
-        <element id="directory" name="classes">
-          <element id="module-output" name="PCabinModule" />
-        </element>
-      </element>
-    </root>
-  </artifact>
-</component>

+ 0 - 8
.idea/artifacts/RegModule_war.xml

@@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="war" name="RegModule:war">
-    <output-path>$PROJECT_DIR$/RegModule/target</output-path>
-    <root id="archive" name="RegModule.war">
-      <element id="artifact" artifact-name="RegModule:war exploded" />
-    </root>
-  </artifact>
-</component>

+ 0 - 68
.idea/artifacts/RegModule_war_exploded.xml

@@ -1,68 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="exploded-war" name="RegModule:war exploded">
-    <output-path>$PROJECT_DIR$/RegModule/target/RegModule</output-path>
-    <root id="root">
-      <element id="directory" name="WEB-INF">
-        <element id="directory" name="classes">
-          <element id="module-output" name="RegModule" />
-        </element>
-        <element id="directory" name="lib">
-          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-aop:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-expression:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-web:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-context:4.3.6.RELEASE" />
-          <element id="archive" name="DBModule-1.0.jar">
-            <element id="module-output" name="DBModule" />
-          </element>
-          <element id="library" level="project" name="Maven: org.hibernate:antlr:2.7.5H3" />
-          <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: mysql:mysql-connector-java:5.1.40" />
-          <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.springframework:spring-core:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: commons-logging:commons-logging:1.2" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-beans:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.biins:spring-commons:1.0.0" />
-          <element id="library" level="project" name="Maven: aopalliance:aopalliance:1.0" />
-          <element id="library" level="project" name="Maven: com.fasterxml.jackson.core:jackson-core:2.8.7" />
-          <element id="library" level="project" name="Maven: jstl:jstl:1.2" />
-          <element id="library" level="project" name="Maven: li.rudin.mavenjs:ajax-utils:1.0" />
-          <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: org.springframework:spring-jdbc:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-tx:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-webmvc-portlet:4.3.6.RELEASE" />
-          <element id="library" level="project" name="Maven: org.springframework:spring-websocket:4.3.6.RELEASE" />
-          <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.webjars:jquery:3.1.1" />
-          <element id="library" level="project" name="Maven: com.efsavage.jquery:jquery-maven:1.8.2" />
-          <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$/RegModule/target/RegModule/META-INF/MANIFEST.MF" />
-      </element>
-      <element id="javaee-facet-resources" facet="RegModule/web/Web" />
-    </root>
-  </artifact>
-</component>

+ 160 - 100
.idea/dataSources/92c07869-f0de-4821-ba4d-23dc56e0fded.xml

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

+ 154 - 285
.idea/workspace.xml

@@ -1,19 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ChangeListManager">
-    <list default="true" id="070a1094-550b-4f3a-bbc4-4306583dd144" name="Default" comment="Commit with additional data entities">
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/SkillDao.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ModeratorListSkills.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/StudentListSkills.java" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/resources/ModerListSkills.hbm.xml" />
-      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/DBModule/src/main/resources/StudentListSkills.hbm.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources/e66f3b80-d157-473d-b64a-69cd88715781.xml" afterPath="$PROJECT_DIR$/.idea/dataSources/e66f3b80-d157-473d-b64a-69cd88715781.xml" />
+    <list default="true" id="070a1094-550b-4f3a-bbc4-4306583dd144" name="Default" comment="">
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/artifacts/PCabinModule_war.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/artifacts/PCabinModule_war_exploded.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/artifacts/PCabinModule_war_exploded2.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/artifacts/RegModule_war.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/artifacts/RegModule_war_exploded.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/META-INF/MANIFEST.MF" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/applicationContext.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css.map" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css.map" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css.map" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css.map" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css.map" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css.map" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.js" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.min.js" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/dispatcher-servlet.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/inViews/firstInViews/adminFirstIn.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/inViews/firstInViews/clientFirstIn.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/clientChangeInfo.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/clientPersCab.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/loginViews/adminBar.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/loginViews/index.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/loginViews/ownerBar.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/loginViews/studentBar.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/otherViews/aboutPage.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/otherViews/accessDeniedView.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/otherViews/contactPage.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/otherViews/errorView.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/registrationViews/regAdminPage.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/registrationViews/regClientPage.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/registrationViews/regStudentPage.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/registrationViews/registration.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/views/registrationViews/registrationSuccess.jsp" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/AuthModule/target/AuthModule/WEB-INF/web.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/DBModule/target/classes/ClientsEntity.hbm.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/DBModule/target/classes/GroupsEntity.hbm.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/DBModule/target/classes/ModeratorsEntity.hbm.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/DBModule/target/classes/Project_mod_skillEntity.hbm.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/DBModule/target/classes/Project_skil_catEntity.hbm.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/DBModule/target/classes/ProjectsEntity.hbm.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/DBModule/target/classes/Skil_catEntity.hbm.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/DBModule/target/classes/Skil_listEntity.hbm.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/DBModule/target/classes/Skil_matchEntity.hbm.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/DBModule/target/classes/StPrEntity.hbm.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/DBModule/target/classes/StudentsEntity.hbm.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/DBModule/target/classes/UsersEntity.hbm.xml" afterPath="" />
+      <change type="DELETED" beforePath="$PROJECT_DIR$/DBModule/target/classes/hibernate.cfg.xml" afterPath="" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/artifacts/DBModule_war_exploded.xml" afterPath="$PROJECT_DIR$/.idea/artifacts/DBModule_war_exploded.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/dataSources/92c07869-f0de-4821-ba4d-23dc56e0fded.xml" afterPath="$PROJECT_DIR$/.idea/dataSources/92c07869-f0de-4821-ba4d-23dc56e0fded.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/MatchSkilEntity.java" afterPath="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/MatchSkilEntity.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ProjectStaffSkillEntity.java" afterPath="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ProjectStaffSkillEntity.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/DBModule/src/main/resources/Project_mod_skillEntity.hbm.xml" afterPath="$PROJECT_DIR$/DBModule/src/main/resources/Project_mod_skillEntity.hbm.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/DBModule/src/main/resources/Skil_matchEntity.hbm.xml" afterPath="$PROJECT_DIR$/DBModule/src/main/resources/Skil_matchEntity.hbm.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/DBModule/src/main/resources/hibernate.cfg.xml" afterPath="$PROJECT_DIR$/DBModule/src/main/resources/hibernate.cfg.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/pom.xml" afterPath="$PROJECT_DIR$/AuthModule/pom.xml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/DBModule/DBModule.iml" afterPath="$PROJECT_DIR$/DBModule/DBModule.iml" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -42,51 +92,44 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="hibernate.cfg.xml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/hibernate.cfg.xml">
+      <file leaf-file-name="StudentMovController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="720">
-              <caret line="40" column="51" lean-forward="false" selection-start-line="40" selection-start-column="51" selection-end-line="40" selection-end-column="51" />
+            <state relative-caret-position="162">
+              <caret line="18" column="13" lean-forward="false" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
+              <folding>
+                <element signature="imports" expanded="false" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="studentFirstIn.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="306">
+              <caret line="17" column="38" lean-forward="false" selection-start-line="17" selection-start-column="38" selection-end-line="17" selection-end-column="38" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ModerListSkills.hbm.xml" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/ModerListSkills.hbm.xml">
+      <file leaf-file-name="pom.xml" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/AuthModule/pom.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="288">
-              <caret line="16" column="82" lean-forward="false" selection-start-line="16" selection-start-column="82" selection-end-line="16" selection-end-column="82" />
+            <state relative-caret-position="430">
+              <caret line="143" column="27" lean-forward="false" selection-start-line="143" selection-start-column="27" selection-end-line="143" selection-end-column="27" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="ModeratorListSkills.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ModeratorListSkills.java">
+      <file leaf-file-name="adminFirstIn.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/adminFirstIn.jsp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="176">
-              <caret line="12" column="16" lean-forward="false" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />
-              <folding>
-                <element signature="e#390#391#0" expanded="true" />
-                <element signature="e#419#420#0" expanded="true" />
-                <element signature="e#463#464#0" expanded="true" />
-                <element signature="e#499#500#0" expanded="true" />
-                <element signature="e#530#531#0" expanded="true" />
-                <element signature="e#623#624#0" expanded="true" />
-                <element signature="e#718#719#0" expanded="true" />
-                <element signature="e#748#749#0" expanded="true" />
-                <element signature="e#795#796#0" expanded="true" />
-                <element signature="e#833#834#0" expanded="true" />
-                <element signature="e#924#925#0" expanded="true" />
-                <element signature="e#952#953#0" expanded="true" />
-                <element signature="e#995#996#0" expanded="true" />
-                <element signature="e#1029#1030#0" expanded="true" />
-                <element signature="e#1121#1122#0" expanded="true" />
-                <element signature="e#1150#1151#0" expanded="true" />
-                <element signature="e#1195#1196#0" expanded="true" />
-                <element signature="e#1231#1232#0" expanded="true" />
-              </folding>
+            <state relative-caret-position="810">
+              <caret line="45" column="50" lean-forward="false" selection-start-line="37" selection-start-column="8" selection-end-line="45" selection-end-column="50" />
+              <folding />
             </state>
           </provider>
         </entry>
@@ -97,8 +140,8 @@
     <option name="RECENT_TEMPLATES">
       <list>
         <option value="spring-beans.schema" />
-        <option value="Jsp File" />
         <option value="Class" />
+        <option value="Jsp File" />
       </list>
     </option>
   </component>
@@ -133,7 +176,6 @@
         <option value="$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/StudentDao.java" />
         <option value="$PROJECT_DIR$/AuthModule/src/main/java/ServiceEntites/AddInfEnt.java" />
         <option value="$PROJECT_DIR$/AuthModule/src/main/java/Controller/PCabinetController.java" />
-        <option value="$PROJECT_DIR$/AuthModule/pom.xml" />
         <option value="$PROJECT_DIR$/pom.xml" />
         <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/errorView.jsp" />
         <option value="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ClientsEntity.java" />
@@ -153,7 +195,6 @@
         <option value="$PROJECT_DIR$/AuthModule/src/main/java/Controller/ClientMovController.java" />
         <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientPersCab.jsp" />
         <option value="$PROJECT_DIR$/AuthModule/src/main/java/Controller/LoginController.java" />
-        <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp" />
         <option value="$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java" />
         <option value="$PROJECT_DIR$/DBModule/src/main/resources/Project_skil_catEntity.hbm.xml" />
         <option value="$PROJECT_DIR$/DBModule/src/main/resources/Skil_catEntity.hbm.xml" />
@@ -171,6 +212,8 @@
         <option value="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ModeratorListSkills.java" />
         <option value="$PROJECT_DIR$/DBModule/src/main/resources/ModerListSkills.hbm.xml" />
         <option value="$PROJECT_DIR$/DBModule/src/main/resources/hibernate.cfg.xml" />
+        <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp" />
+        <option value="$PROJECT_DIR$/AuthModule/pom.xml" />
       </list>
     </option>
   </component>
@@ -218,7 +261,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scratches" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -256,110 +298,13 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="DBModule" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="resources" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mephorce" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mephorce" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="DBModule" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mephorce" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mephorce" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="DBModule" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HibernateEntities" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-          </PATH>
-          <PATH>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mephorce" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="mephorce" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="DBModule" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="src" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="main" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="java" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="DAOImplement" />
+              <option name="myItemId" value="AuthModule" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
+      <pane id="Scratches" />
       <pane id="PackagesPane" />
     </panes>
   </component>
@@ -367,7 +312,7 @@
     <property name="WebServerToolWindowFactoryState" value="false" />
     <property name="aspect.path.notification.shown" value="true" />
     <property name="js.eslint.eslintPackage" value="" />
-    <property name="project.structure.last.edited" value="Problems" />
+    <property name="project.structure.last.edited" value="Artifacts" />
     <property name="project.structure.proportion" value="0.15" />
     <property name="project.structure.side.proportion" value="0.2" />
     <property name="com.intellij.database.dataSource.DataSourceTemplate" value="MySQL" />
@@ -916,7 +861,14 @@
       <workItem from="1488916407301" duration="361000" />
       <workItem from="1488916779437" duration="157000" />
       <workItem from="1488991431614" duration="914000" />
-      <workItem from="1488996830624" duration="5230000" />
+      <workItem from="1488996830624" duration="7730000" />
+      <workItem from="1489173662779" duration="17000" />
+      <workItem from="1489173768906" duration="30000" />
+      <workItem from="1489173936743" duration="57000" />
+      <workItem from="1489174156090" duration="141000" />
+      <workItem from="1489174369054" duration="33000" />
+      <workItem from="1489177273156" duration="210000" />
+      <workItem from="1489177895969" duration="348000" />
     </task>
     <task id="LOCAL-00001" summary="Commit with additional data entities">
       <created>1488992203414</created>
@@ -925,11 +877,18 @@
       <option name="project" value="LOCAL" />
       <updated>1488992203414</updated>
     </task>
-    <option name="localTasksCounter" value="2" />
+    <task id="LOCAL-00002" summary="Connect with new db tables + some operations with db">
+      <created>1489002103634</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1489002103634</updated>
+    </task>
+    <option name="localTasksCounter" value="3" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="81207000" />
+    <option name="totallyTimeSpent" value="84543000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="65" y="24" width="1855" height="1056" extended-state="6" />
@@ -950,12 +909,13 @@
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39979014" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
+      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32984293" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
-      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32948583" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
+      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32948583" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Spring" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Persistence" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@@ -967,7 +927,6 @@
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32984293" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32984293" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
     </layout>
@@ -981,7 +940,8 @@
   <component name="VcsManagerConfiguration">
     <MESSAGE value="First commit project" />
     <MESSAGE value="Commit with additional data entities" />
-    <option name="LAST_COMMIT_MESSAGE" value="Commit with additional data entities" />
+    <MESSAGE value="Connect with new db tables + some operations with db" />
+    <option name="LAST_COMMIT_MESSAGE" value="Connect with new db tables + some operations with db" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1014,13 +974,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/AuthModule/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="358">
-          <caret line="138" column="34" lean-forward="false" selection-start-line="138" selection-start-column="34" selection-end-line="138" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/RegModule/pom.xml" />
     <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/registrationViews/regAdminPage.jsp">
       <provider selected="true" editor-type-id="text-editor">
@@ -1058,13 +1011,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/adminFirstIn.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="13" column="1" lean-forward="false" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/clientFirstIn.jsp">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="486">
@@ -1076,7 +1022,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="576">
           <caret line="32" column="85" lean-forward="false" selection-start-line="32" selection-start-column="85" selection-end-line="32" selection-end-column="85" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1091,7 +1036,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="574">
           <caret line="54" column="24" lean-forward="false" selection-start-line="54" selection-start-column="24" selection-end-line="54" selection-end-column="24" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1186,7 +1130,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp" />
     <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/LoginController.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="385">
@@ -1194,13 +1137,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="11" column="0" lean-forward="false" selection-start-line="11" selection-start-column="0" selection-end-line="11" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/StudentsEntity.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="360">
@@ -1233,7 +1169,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="288">
           <caret line="16" column="20" lean-forward="false" selection-start-line="16" selection-start-column="20" selection-end-line="16" selection-end-column="20" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1241,7 +1176,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="234">
           <caret line="13" column="20" lean-forward="false" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1249,7 +1183,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="234">
           <caret line="13" column="20" lean-forward="false" selection-start-line="13" selection-start-column="20" selection-end-line="13" selection-end-column="20" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1257,22 +1190,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="546">
           <caret line="38" column="1" lean-forward="false" selection-start-line="38" selection-start-column="1" selection-end-line="38" selection-end-column="1" />
-          <folding>
-            <element signature="e#363#364#0" expanded="false" />
-            <element signature="e#391#392#0" expanded="false" />
-            <element signature="e#432#433#0" expanded="false" />
-            <element signature="e#466#467#0" expanded="false" />
-            <element signature="e#494#495#0" expanded="false" />
-            <element signature="e#593#594#0" expanded="false" />
-            <element signature="e#686#687#0" expanded="false" />
-            <element signature="e#713#714#0" expanded="false" />
-            <element signature="e#753#754#0" expanded="false" />
-            <element signature="e#785#786#0" expanded="false" />
-            <element signature="e#884#885#0" expanded="false" />
-            <element signature="e#916#917#0" expanded="false" />
-            <element signature="e#966#967#0" expanded="false" />
-            <element signature="e#1008#1009#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1280,16 +1197,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="198">
           <caret line="11" column="26" lean-forward="false" selection-start-line="11" selection-start-column="26" selection-end-line="11" selection-end-column="26" />
-          <folding>
-            <element signature="e#327#328#0" expanded="false" />
-            <element signature="e#356#357#0" expanded="false" />
-            <element signature="e#400#401#0" expanded="false" />
-            <element signature="e#436#437#0" expanded="false" />
-            <element signature="e#531#532#0" expanded="false" />
-            <element signature="e#562#563#0" expanded="false" />
-            <element signature="e#609#610#0" expanded="false" />
-            <element signature="e#649#650#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1297,16 +1204,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="486">
           <caret line="27" column="0" lean-forward="true" selection-start-line="27" selection-start-column="0" selection-end-line="27" selection-end-column="0" />
-          <folding>
-            <element signature="e#326#327#0" expanded="false" />
-            <element signature="e#354#355#0" expanded="false" />
-            <element signature="e#396#397#0" expanded="false" />
-            <element signature="e#430#431#0" expanded="false" />
-            <element signature="e#528#529#0" expanded="false" />
-            <element signature="e#558#559#0" expanded="false" />
-            <element signature="e#603#604#0" expanded="false" />
-            <element signature="e#641#642#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1324,9 +1221,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="36">
           <caret line="2" column="7" lean-forward="false" selection-start-line="2" selection-start-column="7" selection-end-line="2" selection-end-column="7" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1334,7 +1228,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="450">
           <caret line="25" column="20" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="25" selection-end-column="20" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1342,7 +1235,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="0">
           <caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1350,7 +1242,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
           <caret line="5" column="75" lean-forward="false" selection-start-line="5" selection-start-column="75" selection-end-line="5" selection-end-column="75" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1358,9 +1249,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="860">
           <caret line="50" column="19" lean-forward="false" selection-start-line="50" selection-start-column="19" selection-end-line="50" selection-end-column="19" />
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1368,12 +1256,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="270">
           <caret line="15" column="27" lean-forward="false" selection-start-line="15" selection-start-column="27" selection-end-line="15" selection-end-column="27" />
-          <folding>
-            <element signature="e#394#395#0" expanded="true" />
-            <element signature="e#426#427#0" expanded="true" />
-            <element signature="e#476#477#0" expanded="true" />
-            <element signature="e#518#519#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1381,7 +1263,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="10" column="92" lean-forward="false" selection-start-line="10" selection-start-column="92" selection-end-line="10" selection-end-column="92" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1389,12 +1270,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="666">
           <caret line="56" column="29" lean-forward="false" selection-start-line="56" selection-start-column="29" selection-end-line="56" selection-end-column="29" />
-          <folding>
-            <element signature="e#1446#1447#0" expanded="true" />
-            <element signature="e#1478#1479#0" expanded="true" />
-            <element signature="e#1528#1529#0" expanded="true" />
-            <element signature="e#1570#1571#0" expanded="true" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1402,26 +1277,21 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="860">
           <caret line="59" column="0" lean-forward="false" selection-start-line="59" selection-start-column="0" selection-end-line="59" selection-end-column="0" />
-          <folding>
-            <element signature="e#395#396#0" expanded="true" />
-            <element signature="e#424#425#0" expanded="true" />
-            <element signature="e#468#469#0" expanded="true" />
-            <element signature="e#504#505#0" expanded="true" />
-            <element signature="e#535#536#0" expanded="true" />
-            <element signature="e#632#633#0" expanded="true" />
-            <element signature="e#728#729#0" expanded="true" />
-            <element signature="e#760#761#0" expanded="true" />
-            <element signature="e#811#812#0" expanded="true" />
-            <element signature="e#853#854#0" expanded="true" />
-            <element signature="e#948#949#0" expanded="true" />
-            <element signature="e#978#979#0" expanded="true" />
-            <element signature="e#1025#1026#0" expanded="true" />
-            <element signature="e#1063#1064#0" expanded="true" />
-            <element signature="e#1155#1156#0" expanded="true" />
-            <element signature="e#1184#1185#0" expanded="true" />
-            <element signature="e#1229#1230#0" expanded="true" />
-            <element signature="e#1265#1266#0" expanded="true" />
-          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/hibernate.cfg.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="720">
+          <caret line="40" column="51" lean-forward="false" selection-start-line="40" selection-start-column="51" selection-end-line="40" selection-end-column="51" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/ModerListSkills.hbm.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="288">
+          <caret line="16" column="82" lean-forward="false" selection-start-line="16" selection-start-column="82" selection-end-line="16" selection-end-column="82" />
         </state>
       </provider>
     </entry>
@@ -1429,41 +1299,39 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="176">
           <caret line="12" column="16" lean-forward="false" selection-start-line="12" selection-start-column="16" selection-end-line="12" selection-end-column="16" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="162">
+          <caret line="18" column="13" lean-forward="false" selection-start-line="18" selection-start-column="13" selection-end-line="18" selection-end-column="13" />
           <folding>
-            <element signature="e#390#391#0" expanded="true" />
-            <element signature="e#419#420#0" expanded="true" />
-            <element signature="e#463#464#0" expanded="true" />
-            <element signature="e#499#500#0" expanded="true" />
-            <element signature="e#530#531#0" expanded="true" />
-            <element signature="e#623#624#0" expanded="true" />
-            <element signature="e#718#719#0" expanded="true" />
-            <element signature="e#748#749#0" expanded="true" />
-            <element signature="e#795#796#0" expanded="true" />
-            <element signature="e#833#834#0" expanded="true" />
-            <element signature="e#924#925#0" expanded="true" />
-            <element signature="e#952#953#0" expanded="true" />
-            <element signature="e#995#996#0" expanded="true" />
-            <element signature="e#1029#1030#0" expanded="true" />
-            <element signature="e#1121#1122#0" expanded="true" />
-            <element signature="e#1150#1151#0" expanded="true" />
-            <element signature="e#1195#1196#0" expanded="true" />
-            <element signature="e#1231#1232#0" expanded="true" />
+            <element signature="imports" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/ModerListSkills.hbm.xml">
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/adminFirstIn.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
-          <caret line="16" column="82" lean-forward="false" selection-start-line="16" selection-start-column="82" selection-end-line="16" selection-end-column="82" />
+        <state relative-caret-position="810">
+          <caret line="45" column="50" lean-forward="false" selection-start-line="37" selection-start-column="8" selection-end-line="45" selection-end-column="50" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/hibernate.cfg.xml">
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="720">
-          <caret line="40" column="51" lean-forward="false" selection-start-line="40" selection-start-column="51" selection-end-line="40" selection-end-column="51" />
+        <state relative-caret-position="306">
+          <caret line="17" column="38" lean-forward="false" selection-start-line="17" selection-start-column="38" selection-end-line="17" selection-end-column="38" />
+          <folding />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/AuthModule/pom.xml">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="430">
+          <caret line="143" column="27" lean-forward="false" selection-start-line="143" selection-start-column="27" selection-end-line="143" selection-end-column="27" />
           <folding />
         </state>
       </provider>
@@ -1487,7 +1355,7 @@
       </state>
       <state key="FacetStructureConfigurable.UI">
         <settings>
-          <last-edited>Spring (PCabinModule)|Spring</last-edited>
+          <last-edited>Web (AuthModule)|Web</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
@@ -1523,11 +1391,12 @@
       </state>
       <state key="ModuleStructureConfigurable.UI">
         <settings>
-          <last-edited>Hibernate|DBModule</last-edited>
+          <last-edited>AuthModule</last-edited>
           <splitter-proportions>
             <option name="proportions">
               <list>
                 <option value="0.2" />
+                <option value="0.6" />
               </list>
             </option>
           </splitter-proportions>

+ 5 - 0
AuthModule/pom.xml

@@ -139,6 +139,11 @@
             <version>1.3.0.RELEASE</version>
         </dependency>
         <dependency>
+            <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-mapper-asl</artifactId>
+            <version>1.9.13</version>
+        </dependency>
+        <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <version>2.8.7</version>

+ 34 - 0
AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/studentFirstIn.jsp

@@ -0,0 +1,34 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: kinetik
+  Date: 08.03.17
+  Time: 23:00
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title>Title</title>
+    <link rel="stylesheet"
+          href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css">
+    <script
+            src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js"></script>
+    <script
+            src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>
+    <script
+            src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.17/angular.min.js"></script>
+    <script src="assets/js/controllers.js"></script>
+</head>
+<body>
+<form:form method="post" modelAttribute="addInf" action="addInformAdmin">
+    <form:input path="birthdate" type="date" value="" placeholder="Дата рождения" id="birthdate"/>${birthMessage}<br/>
+    <form:input path="e_mail" type="email" value="" placeholder="E-mail" id="email"/>${emailMessage}<br/>
+    <form:input path="phone_number" type="text" placeholder="Номер телефона"/>${phoneMessage}<br/>
+    <form:input path="hometown" type="text" placeholder="Город"/>${hometownMessage}<br/>
+    <form:button>Изменить данные</form:button>
+    ${errorMessage}
+</form:form>
+<a href="/PCabinAdmin">Заполнить позже</a>
+</body>
+</html>

+ 0 - 5
AuthModule/target/AuthModule/META-INF/MANIFEST.MF

@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-Built-By: kinetik
-Created-By: IntelliJ IDEA
-Build-Jdk: 1.8.0_121
-

+ 0 - 6
AuthModule/target/AuthModule/WEB-INF/applicationContext.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd">
-
-</beans>

File diff suppressed because it is too large
+ 0 - 1339
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css


File diff suppressed because it is too large
+ 0 - 1
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.css.map


File diff suppressed because it is too large
+ 0 - 1
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css


File diff suppressed because it is too large
+ 0 - 1
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-grid.min.css.map


+ 0 - 459
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css

@@ -1,459 +0,0 @@
-/*! normalize.css v5.0.0 | MIT License | github.com/necolas/normalize.css */
-html {
-  font-family: sans-serif;
-  line-height: 1.15;
-  -ms-text-size-adjust: 100%;
-  -webkit-text-size-adjust: 100%;
-}
-
-body {
-  margin: 0;
-}
-
-article,
-aside,
-footer,
-header,
-nav,
-section {
-  display: block;
-}
-
-h1 {
-  font-size: 2em;
-  margin: 0.67em 0;
-}
-
-figcaption,
-figure,
-main {
-  display: block;
-}
-
-figure {
-  margin: 1em 40px;
-}
-
-hr {
-  -webkit-box-sizing: content-box;
-          box-sizing: content-box;
-  height: 0;
-  overflow: visible;
-}
-
-pre {
-  font-family: monospace, monospace;
-  font-size: 1em;
-}
-
-a {
-  background-color: transparent;
-  -webkit-text-decoration-skip: objects;
-}
-
-a:active,
-a:hover {
-  outline-width: 0;
-}
-
-abbr[title] {
-  border-bottom: none;
-  text-decoration: underline;
-  text-decoration: underline dotted;
-}
-
-b,
-strong {
-  font-weight: inherit;
-}
-
-b,
-strong {
-  font-weight: bolder;
-}
-
-code,
-kbd,
-samp {
-  font-family: monospace, monospace;
-  font-size: 1em;
-}
-
-dfn {
-  font-style: italic;
-}
-
-mark {
-  background-color: #ff0;
-  color: #000;
-}
-
-small {
-  font-size: 80%;
-}
-
-sub,
-sup {
-  font-size: 75%;
-  line-height: 0;
-  position: relative;
-  vertical-align: baseline;
-}
-
-sub {
-  bottom: -0.25em;
-}
-
-sup {
-  top: -0.5em;
-}
-
-audio,
-video {
-  display: inline-block;
-}
-
-audio:not([controls]) {
-  display: none;
-  height: 0;
-}
-
-img {
-  border-style: none;
-}
-
-svg:not(:root) {
-  overflow: hidden;
-}
-
-button,
-input,
-optgroup,
-select,
-textarea {
-  font-family: sans-serif;
-  font-size: 100%;
-  line-height: 1.15;
-  margin: 0;
-}
-
-button,
-input {
-  overflow: visible;
-}
-
-button,
-select {
-  text-transform: none;
-}
-
-button,
-html [type="button"],
-[type="reset"],
-[type="submit"] {
-  -webkit-appearance: button;
-}
-
-button::-moz-focus-inner,
-[type="button"]::-moz-focus-inner,
-[type="reset"]::-moz-focus-inner,
-[type="submit"]::-moz-focus-inner {
-  border-style: none;
-  padding: 0;
-}
-
-button:-moz-focusring,
-[type="button"]:-moz-focusring,
-[type="reset"]:-moz-focusring,
-[type="submit"]:-moz-focusring {
-  outline: 1px dotted ButtonText;
-}
-
-fieldset {
-  border: 1px solid #c0c0c0;
-  margin: 0 2px;
-  padding: 0.35em 0.625em 0.75em;
-}
-
-legend {
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  color: inherit;
-  display: table;
-  max-width: 100%;
-  padding: 0;
-  white-space: normal;
-}
-
-progress {
-  display: inline-block;
-  vertical-align: baseline;
-}
-
-textarea {
-  overflow: auto;
-}
-
-[type="checkbox"],
-[type="radio"] {
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-  padding: 0;
-}
-
-[type="number"]::-webkit-inner-spin-button,
-[type="number"]::-webkit-outer-spin-button {
-  height: auto;
-}
-
-[type="search"] {
-  -webkit-appearance: textfield;
-  outline-offset: -2px;
-}
-
-[type="search"]::-webkit-search-cancel-button,
-[type="search"]::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-::-webkit-file-upload-button {
-  -webkit-appearance: button;
-  font: inherit;
-}
-
-details,
-menu {
-  display: block;
-}
-
-summary {
-  display: list-item;
-}
-
-canvas {
-  display: inline-block;
-}
-
-template {
-  display: none;
-}
-
-[hidden] {
-  display: none;
-}
-
-html {
-  -webkit-box-sizing: border-box;
-          box-sizing: border-box;
-}
-
-*,
-*::before,
-*::after {
-  -webkit-box-sizing: inherit;
-          box-sizing: inherit;
-}
-
-@-ms-viewport {
-  width: device-width;
-}
-
-html {
-  -ms-overflow-style: scrollbar;
-  -webkit-tap-highlight-color: transparent;
-}
-
-body {
-  font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
-  font-size: 1rem;
-  font-weight: normal;
-  line-height: 1.5;
-  color: #292b2c;
-  background-color: #fff;
-}
-
-[tabindex="-1"]:focus {
-  outline: none !important;
-}
-
-h1, h2, h3, h4, h5, h6 {
-  margin-top: 0;
-  margin-bottom: .5rem;
-}
-
-p {
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-abbr[title],
-abbr[data-original-title] {
-  cursor: help;
-}
-
-address {
-  margin-bottom: 1rem;
-  font-style: normal;
-  line-height: inherit;
-}
-
-ol,
-ul,
-dl {
-  margin-top: 0;
-  margin-bottom: 1rem;
-}
-
-ol ol,
-ul ul,
-ol ul,
-ul ol {
-  margin-bottom: 0;
-}
-
-dt {
-  font-weight: bold;
-}
-
-dd {
-  margin-bottom: .5rem;
-  margin-left: 0;
-}
-
-blockquote {
-  margin: 0 0 1rem;
-}
-
-a {
-  color: #0275d8;
-  text-decoration: none;
-}
-
-a:focus, a:hover {
-  color: #014c8c;
-  text-decoration: underline;
-}
-
-a:not([href]):not([tabindex]) {
-  color: inherit;
-  text-decoration: none;
-}
-
-a:not([href]):not([tabindex]):focus, a:not([href]):not([tabindex]):hover {
-  color: inherit;
-  text-decoration: none;
-}
-
-a:not([href]):not([tabindex]):focus {
-  outline: 0;
-}
-
-pre {
-  margin-top: 0;
-  margin-bottom: 1rem;
-  overflow: auto;
-}
-
-figure {
-  margin: 0 0 1rem;
-}
-
-img {
-  vertical-align: middle;
-}
-
-[role="button"] {
-  cursor: pointer;
-}
-
-a,
-area,
-button,
-[role="button"],
-input,
-label,
-select,
-summary,
-textarea {
-  -ms-touch-action: manipulation;
-      touch-action: manipulation;
-}
-
-table {
-  border-collapse: collapse;
-  background-color: transparent;
-}
-
-caption {
-  padding-top: 0.75rem;
-  padding-bottom: 0.75rem;
-  color: #636c72;
-  text-align: left;
-  caption-side: bottom;
-}
-
-th {
-  text-align: left;
-}
-
-label {
-  display: inline-block;
-  margin-bottom: .5rem;
-}
-
-button:focus {
-  outline: 1px dotted;
-  outline: 5px auto -webkit-focus-ring-color;
-}
-
-input,
-button,
-select,
-textarea {
-  line-height: inherit;
-}
-
-input[type="radio"]:disabled,
-input[type="checkbox"]:disabled {
-  cursor: not-allowed;
-}
-
-input[type="date"],
-input[type="time"],
-input[type="datetime-local"],
-input[type="month"] {
-  -webkit-appearance: listbox;
-}
-
-textarea {
-  resize: vertical;
-}
-
-fieldset {
-  min-width: 0;
-  padding: 0;
-  margin: 0;
-  border: 0;
-}
-
-legend {
-  display: block;
-  width: 100%;
-  padding: 0;
-  margin-bottom: .5rem;
-  font-size: 1.5rem;
-  line-height: inherit;
-}
-
-input[type="search"] {
-  -webkit-appearance: none;
-}
-
-output {
-  display: inline-block;
-}
-
-[hidden] {
-  display: none !important;
-}
-/*# sourceMappingURL=bootstrap-reboot.css.map */

File diff suppressed because it is too large
+ 0 - 1
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.css.map


File diff suppressed because it is too large
+ 0 - 1
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css


File diff suppressed because it is too large
+ 0 - 1
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap-reboot.min.css.map


File diff suppressed because it is too large
+ 0 - 9320
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css


File diff suppressed because it is too large
+ 0 - 1
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.css.map


File diff suppressed because it is too large
+ 0 - 6
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css


File diff suppressed because it is too large
+ 0 - 1
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css.map


+ 0 - 275
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css

@@ -1,275 +0,0 @@
-html {
-    position: relative;
-    min-height: 100%;
-    font-family: 'Roboto', sans-serif;
-    max-width: 100%;
-    overflow-x: hidden;
-}
-body {
-    margin-bottom: 60px;
-    max-width: 100%;
-    overflow-x: hidden;
-}
-
-.cf {
-    width: 50%;
-    margin: 0 auto;
-    text-align: center;
-    font-size: 14px;
-    margin-top: 100px;
-}
-
-.cf h1 {
-    text-align: center;
-    color: #000;
-    font-size: 18px;
-    margin-bottom: 15px;
-}
-
-.navbar {
-    border-bottom: 1px solid #063971;
-    background-color: #eceeef;
-}
-
-.navbar-brand{
-    color: #063971;
-}
-
-.nav-masthead{
-    float: right;
-}
-
-.nav-masthead a{
-    color: #063971;
-}
-
-.footer {
-    position: absolute;
-    bottom: 0;
-    width: 100%;
-    height: 25px;
-    background-color: #f5f5f5;
-    text-align: center;
-}
-
-body > .container {
-    padding: 0px 15px 0;
-}
-
-.container .text-muted {
-    margin: 0px 0;
-}
-
-.footer > .container {
-    padding-right: 15px;
-    padding-left: 15px;
-}
-
-.login-block input {
-    width: 100%;
-    height: 42px;
-    box-sizing: border-box;
-    border-radius: 5px;
-    border: 1px solid #ccc;
-    margin-bottom: 20px;
-    font-size: 14px;
-    padding: 0 20px 0 50px;
-    outline: none;
-    background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
-    background-size: 16px 80px;
-}
-
-.personal-page-block {
-    width: 400px;
-    padding: 20px;
-    background: #ffffff;
-    border: 1px solid #063971;
-    border-radius: 5px;
-    border-top: 5px solid #063971;
-    margin: 0 auto;
-    margin-top: 100px;
-    margin-bottom: 40px;
-}
-
-.personal-page-block h1 {
-    text-align: center;
-    color: #000;
-    font-size: 18px;
-    text-transform: uppercase;
-    margin-top: 0;
-    margin-bottom: 20px;
-}
-
-.info-block {
-    width: 500px;
-    padding: 20px;
-    background: #ffffff;
-    border: 1px solid #063971;
-    border-radius: 5px;
-    border-top: 5px solid #063971;
-    margin: 0 auto;
-    margin-top: 100px;
-    margin-bottom: 40px;
-}
-
-.info-block h1 {
-    text-align: center;
-    color: #000;
-    font-size: 26px;
-    margin-top: 0;
-    margin-bottom: 20px;
-}
-
-.info-block h2 {
-    text-align: center;
-    color: #000;
-    font-size: 22px;
-    margin-top: 0;
-    margin-bottom: 20px;
-}
-
-.login-block input#password {
-    background: #fff url('http://i.imgur.com/Qf83FTt.png') 20px top no-repeat;
-    background-size: 16px 80px;
-}
-
-.login-block input:active, .login-block input:focus {
-    border: 1px solid #063971;
-}
-
-.login-block form select {
-    width: 100%;
-    height: 42px;
-    box-sizing: border-box;
-    border-radius: 5px;
-    border: 1px solid #ccc;
-    margin-bottom: 20px;
-    font-size: 14px;
-    padding: 0 20px 0 50px;
-    outline: none;
-    background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
-    background-size: 16px 80px;
-}
-
-.login-block form select option {
-    align-items: center;
-    color: #111;
-    display: flex;
-    justify-content: space-between;
-    font-size: 1.5em;
-    width: auto;
-}
-
-.login-block 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 button:hover {
-    background: #063971;
-}
-
-.login-block {
-    width: 400px;
-    padding: 20px;
-    background: #ffffff;
-    border: 1px solid #063971;
-    border-radius: 5px;
-    border-top: 5px solid #063971;
-    margin: 0 auto;
-    margin-top: 100px;
-    margin-bottom: 40px;
-}
-
-.login-block h1 {
-    text-align: center;
-    color: #000;
-    font-size: 18px;
-    text-transform: uppercase;
-    margin-top: 0;
-    margin-bottom: 20px;
-}
-
-.projects-block {
-    /*width: 300px; */
-    padding: 20px;
-    background: #ffffff;
-    /*border: 1px solid #063971;
-    border-radius: 5px;
-    border-top: 5px solid #063971; */
-    margin: 0 auto;
-    margin-top: 100px;
-    margin-bottom: 40px;
-}
-
-.projects-block h1 {
-    text-align: center;
-    color: #000;
-    font-size: 18px;
-    text-transform: uppercase;
-    margin-top: 0;
-    margin-bottom: 20px;
-}
-
-.projects-block table {
-    border-collapse: separate;
-    border-spacing: 50px 0;
-}
-
-.projects-block table td {
-    padding: 10px 0;
-}
-
-.btn-secondary,
-.btn-secondary:hover,
-.btn-secondary:focus {
-    color: #333;
-    text-shadow: none; /* Prevent inheritance from `body` */
-    background-color: #fff;
-    border: .05rem solid #fff;
-}
-
-@media (max-width: 767px) {
-
-    .nav-masthead{
-        float: none;
-    }
-
-    .login-block {
-        width: 100%;
-        padding: 20px;
-        background: #ffffff;
-        border: 1px solid #063971;
-        border-radius: 5px;
-        border-top: 5px solid #063971;
-        margin: 0 auto;
-        margin-top: 100px;
-    }
-    .nav-link{
-        margin-top: 10px;
-    }
-    .login-block form select{
-        width: 100%;
-        height: 42px;
-        box-sizing: border-box;
-        border-radius: 5px;
-        border: 1px solid #ccc;
-        margin-bottom: 20px;
-        font-size: 14px;
-        font-family: 'Roboto', sans-serif;
-        padding: 0 20px 0 50px;
-        outline: none;
-        background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
-        background-size: 16px 80px;
-    }
-}

File diff suppressed because it is too large
+ 0 - 3535
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.js


File diff suppressed because it is too large
+ 0 - 7
AuthModule/target/AuthModule/WEB-INF/bootstrap-4.0.0-alpha.6-dist/js/bootstrap.min.js


+ 0 - 32
AuthModule/target/AuthModule/WEB-INF/dispatcher-servlet.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xmlns:mvc="http://www.springframework.org/schema/mvc"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
-        http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc.xsd">
-
-    <!-- DispatcherServlet Context: defines this servlet's request-processing
-        infrastructure -->
-    <context:component-scan base-package="Controller" />
-    <mvc:annotation-driven/>
-    <!-- Resolves views selected for rendering by @Controllers to .jsp resources
-        in the /WEB-INF/views directory -->
-    <bean
-            class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-        <property name="prefix" value="/WEB-INF/views/" />
-        <property name="suffix" value=".jsp" />
-    </bean>
-    <bean class = "org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter">
-        <property name="messageConverters">
-            <array>
-                <bean class = "org.springframework.http.converter.StringHttpMessageConverter">
-                    <property name="supportedMediaTypes" value = "text/plain;charset=UTF-8" />
-                </bean>
-            </array>
-        </property>
-    </bean>
-
-
-</beans>

+ 0 - 57
AuthModule/target/AuthModule/WEB-INF/views/inViews/firstInViews/adminFirstIn.jsp

@@ -1,57 +0,0 @@
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%--
-  Created by IntelliJ IDEA.
-  User: kinetik
-  Date: 05.03.17
-  Time: 22:13
-  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>
-    <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">
-        <h1> Изменение персональных данных </h1>
-        ${Admin.modFamily} ${Admin.modFirstName} ${Admin.modSecName} </br>
-        </br>
-        <form:form method="post" modelAttribute="addInf" action="addInformAdmin">
-            <form:input path="birthdate" type="date" value="" placeholder="Дата рождения" id="birthdate"/>${birthMessage}<br/>
-            <form:input path="e_mail" type="email" value="" placeholder="E-mail" id="email"/>${emailMessage}<br/>
-            <form:input path="phone_number" type="text" placeholder="Номер телефона"/>${phoneMessage}<br/>
-            <form:input path="hometown" type="text" placeholder="Город"/>${hometownMessage}<br/>
-            <form:button>Изменить данные</form:button>
-            ${errorMessage}
-        </form:form>
-        <a href="/PCabinAdmin">Заполнить позже</a>
-    </div>
-</div>
-
-<footer class="footer">
-    <div class="container">
-        <p class="text-muted">&copy;2017 Mephorce</p>
-    </div>
-</footer>
-
-</body>
-</html>

+ 0 - 58
AuthModule/target/AuthModule/WEB-INF/views/inViews/firstInViews/clientFirstIn.jsp

@@ -1,58 +0,0 @@
-<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%--
-  Created by IntelliJ IDEA.
-  User: kinetik
-  Date: 05.03.17
-  Time: 21:35
-  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>
-    <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">
-        <h1> Изменение персональных данных </h1>
-        ${Client.clFamily} ${Client.clFirstName} ${Client.clSecName} </br>
-        </br>
-        <form:form method="post" modelAttribute="addInf" action="/addInformClient">
-            <form:input path="birthdate" type="date" value="" placeholder="Дата рождения" id="birthdate"/>${birthMessage}<br/>
-            <form:input path="e_mail" type="email" value="" placeholder="E-mail" id="email"/>${emailMessage}<br/>
-            <form:input path="phone_number" type="text" placeholder="Номер телефона"/>${phoneMessage}<br/>
-            <form:input path="hometown" type="text" placeholder="Город"/>${hometownMessage}<br/>
-            <form:input path="company" type="text" placeholder="Компания"/>${companyMessage}<br/>
-            <form:input path="position" type="text" placeholder="Должность"/>${posMessage}<br/>
-            <form:button>Изменить данные</form:button>
-            ${errorMessage}
-        </form:form>
-        <a href="/PCabinClient">Заполнить позже</a>
-    </div>
-</div>
-
-<footer class="footer">
-    <div class="container">
-        <p class="text-muted">&copy;2017 Mephorce</p>
-    </div>
-</footer>
-
-</body>
-</html>

+ 0 - 56
AuthModule/target/AuthModule/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp

@@ -1,56 +0,0 @@
-<%@ 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>
-    <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">
-        <h1> Изменение персональных данных </h1>
-        ${Admin.modFamily} ${Admin.modFirstName} ${Admin.modSecName} </br>
-        </br>
-        <form:form method="post" modelAttribute="addInf" action="addInformAdmin">
-            <form:input path="birthdate" type="date" value="" placeholder="${Admin.modBirthdate}" id="birthdate"/>${birthMessage}<br/>
-