Browse Source

Alex merge

kinetik 4 years ago
parent
commit
2aaa507328

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

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

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

@@ -9,7 +9,9 @@
       <case-sensitivity plain-identifiers="exact" quoted-identifiers="exact" />
       <secret-storage>master_key</secret-storage>
       <user-name>root</user-name>
+      <introspection-schemas>*:anketa</introspection-schemas>
       <resolve-scope>anketa:</resolve-scope>
+      <unqualified-resolve-schemas>anketa:</unqualified-resolve-schemas>
     </data-source>
     <data-source name="hibernate.cfg.xml/Hibernate" uuid="92c07869-f0de-4821-ba4d-23dc56e0fded">
       <database-info product="MySQL" version="5.7.17-0ubuntu0.16.04.1" jdbc-version="4.0" driver-name="MySQL Connector Java" driver-version="mysql-connector-java-5.1.35 ( Revision: 5fb9c5849535c13917c2cf9baaece6ef9693ef27 )">
@@ -19,7 +21,9 @@
       <case-sensitivity plain-identifiers="exact" quoted-identifiers="exact" />
       <secret-storage>master_key</secret-storage>
       <user-name>root</user-name>
+      <introspection-schemas>*:anketa</introspection-schemas>
       <resolve-scope>anketa:</resolve-scope>
+      <unqualified-resolve-schemas>anketa:</unqualified-resolve-schemas>
     </data-source>
   </component>
 </project>

+ 370 - 177
.idea/workspace.xml

@@ -2,12 +2,18 @@
 <project version="4">
   <component name="ChangeListManager">
     <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/persCabViews/studentPersCab.jsp" />
-      <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="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/moderatorViews/mainWindowProject.jsp" />
+      <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/moderatorViews/startPageModerator.jsp" />
+      <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.local.xml" afterPath="$PROJECT_DIR$/.idea/dataSources.local.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/java/Controller/LoginController.java" afterPath="$PROJECT_DIR$/AuthModule/src/main/java/Controller/LoginController.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java" afterPath="$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/loginViews/studentBar.jsp" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/loginViews/studentBar.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/AuthModule.iml" afterPath="$PROJECT_DIR$/AuthModule/AuthModule.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/java/Controller/AdminMovController.java" afterPath="$PROJECT_DIR$/AuthModule/src/main/java/Controller/AdminMovController.java" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp" afterPath="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/DBModule/DBModule.iml" afterPath="$PROJECT_DIR$/DBModule/DBModule.iml" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/AdminDao.java" afterPath="$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/AdminDao.java" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -36,81 +42,111 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="StudentMovController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java">
+      <file leaf-file-name="studentBar.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/loginViews/studentBar.jsp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="450">
-              <caret line="44" column="0" lean-forward="false" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
+            <state relative-caret-position="367">
+              <caret line="97" column="65" lean-forward="false" selection-start-line="97" selection-start-column="65" selection-end-line="97" selection-end-column="65" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="LoginController.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/LoginController.java">
+      <file leaf-file-name="adminPersCab.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="479">
-              <caret line="169" column="0" lean-forward="false" selection-start-line="169" selection-start-column="0" selection-end-line="169" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="885">
+              <caret line="83" column="7" lean-forward="false" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
+              <folding>
+                <element signature="e#3333#3339#0#HTML" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="HibernateUtil.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateUtil/HibernateUtil.java">
+      <file leaf-file-name="mainWindowProject.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/moderatorViews/mainWindowProject.jsp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="252">
-              <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="885">
+              <caret line="82" column="0" lean-forward="false" selection-start-line="82" selection-start-column="0" selection-end-line="82" selection-end-column="0" />
+              <folding>
+                <element signature="e#3105#3111#0#HTML" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="studentBar.jsp" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/loginViews/studentBar.jsp">
+      <file leaf-file-name="startPageModerator.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/moderatorViews/startPageModerator.jsp">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="234">
-              <caret line="97" column="0" lean-forward="false" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
-              <folding />
+            <state relative-caret-position="885">
+              <caret line="95" column="0" lean-forward="false" selection-start-line="95" selection-start-column="0" selection-end-line="95" selection-end-column="0" />
+              <folding>
+                <element signature="e#3672#3678#0#HTML" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="adminPersCab.jsp" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp">
+      <file leaf-file-name="LoginController.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/LoginController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="191">
-              <caret line="21" column="16" lean-forward="false" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
+            <state relative-caret-position="2534">
+              <caret line="169" column="0" lean-forward="false" selection-start-line="169" selection-start-column="0" selection-end-line="169" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="clientPersCab.jsp" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientPersCab.jsp">
+      <file leaf-file-name="AdminMovController.java" pinned="false" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/AdminMovController.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="295">
-              <caret line="80" column="50" lean-forward="true" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
+            <state relative-caret-position="220">
+              <caret line="41" column="41" lean-forward="false" selection-start-line="41" selection-start-column="29" selection-end-line="41" selection-end-column="41" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="AdminDao.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/AdminDao.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="760">
+              <caret line="57" column="35" lean-forward="false" selection-start-line="57" selection-start-column="35" selection-end-line="57" selection-end-column="35" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="studentPersCab.jsp" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/studentPersCab.jsp">
+      <file leaf-file-name="adminChangeInfo.jsp" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="1560">
+              <caret line="78" column="0" lean-forward="false" selection-start-line="78" selection-start-column="0" selection-end-line="78" selection-end-column="0" />
+              <folding>
+                <element signature="e#3331#3337#0#HTML" expanded="true" />
+              </folding>
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file leaf-file-name="cssforpr.css" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="288">
-              <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+            <state relative-caret-position="145">
+              <caret line="278" column="8" lean-forward="false" selection-start-line="278" selection-start-column="8" selection-end-line="278" selection-end-column="8" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="StudentsEntity.java" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/StudentsEntity.java">
+      <file leaf-file-name="hibernate.cfg.xml" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/hibernate.cfg.xml">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="198">
-              <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+            <state relative-caret-position="220">
+              <caret line="11" column="78" lean-forward="false" selection-start-line="8" selection-start-column="6" selection-end-line="11" selection-end-column="78" />
               <folding />
             </state>
           </provider>
@@ -130,7 +166,6 @@
   <component name="Git.Settings">
     <option name="ROOT_SYNC" value="DONT_SYNC" />
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
-    <option name="FORCE_PUSH_ALLOWED" value="true" />
   </component>
   <component name="GradleLocalSettings">
     <option name="modificationStamps">
@@ -145,14 +180,10 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/RegModule/src/main/webapp/WEB-INF/views/registrationViews/regStudentPage.jsp" />
-        <option value="$PROJECT_DIR$/AuthModule/src/main/java/ServiceEntites/LoginStudent.java" />
-        <option value="$PROJECT_DIR$/DBModule/src/main/resources/ClientsEntity.hbm.xml" />
         <option value="$PROJECT_DIR$/DBModule/src/main/resources/StudentsEntity.hbm.xml" />
         <option value="$PROJECT_DIR$/DBModule/src/main/resources/ModeratorsEntity.hbm.xml" />
         <option value="$PROJECT_DIR$/RegModule/src/main/java/Controller/RegistrationController.java" />
         <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/accessDeniedView.jsp" />
-        <option value="$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/AdminDao.java" />
         <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" />
@@ -163,14 +194,11 @@
         <option value="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ModeratorsEntity.java" />
         <option value="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/StudentsEntity.java" />
         <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/adminFirstIn.jsp" />
-        <option value="$PROJECT_DIR$/AuthModule/src/main/java/Controller/AdminMovController.java" />
-        <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp" />
         <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/firstInViews/clientFirstIn.jsp" />
         <option value="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ProjectsEntity.java" />
         <option value="$PROJECT_DIR$/DBModule/src/main/resources/ProjectsEntity.hbm.xml" />
         <option value="$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/ClientsDao.java" />
         <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientChangeInfo.jsp" />
-        <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp" />
         <option value="$PROJECT_DIR$/AuthModule/src/main/java/ServiceEntites/SelectProject.java" />
         <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" />
@@ -196,6 +224,13 @@
         <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/loginViews/studentBar.jsp" />
         <option value="$PROJECT_DIR$/AuthModule/src/main/java/Controller/LoginController.java" />
         <option value="$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java" />
+        <option value="$PROJECT_DIR$/AuthModule/src/main/java/Controller/AdminMovController.java" />
+        <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" />
+        <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp" />
+        <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp" />
+        <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/moderatorViews/mainWindowProject.jsp" />
+        <option value="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/moderatorViews/startPageModerator.jsp" />
+        <option value="$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/AdminDao.java" />
       </list>
     </option>
   </component>
@@ -221,9 +256,9 @@
   </component>
   <component name="ProjectFrameBounds">
     <option name="x" value="65" />
-    <option name="y" value="24" />
+    <option name="y" value="-4" />
     <option name="width" value="1855" />
-    <option name="height" value="1056" />
+    <option name="height" value="1084" />
   </component>
   <component name="ProjectLevelVcsManager" settingsEditedManually="true">
     <ConfirmationsSetting value="2" id="Add" />
@@ -243,6 +278,8 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+      <pane id="Scratches" />
+      <pane id="PackagesPane" />
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -343,7 +380,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="HibernateEntities" />
+              <option name="myItemId" value="DAOImplement" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -459,7 +496,7 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="loginViews" />
+              <option name="myItemId" value="moderatorViews" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -500,8 +537,38 @@
               <option name="myItemId" value="inViews" />
               <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="AuthModule" />
+              <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="webapp" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
+            <PATH_ELEMENT>
+              <option name="myItemId" value="WEB-INF" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="persCabViews" />
+              <option name="myItemId" value="bootstrap-4.0.0-alpha.6-dist" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -535,11 +602,11 @@
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="views" />
+              <option name="myItemId" value="bootstrap-4.0.0-alpha.6-dist" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
             <PATH_ELEMENT>
-              <option name="myItemId" value="inViews" />
+              <option name="myItemId" value="css" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
           </PATH>
@@ -564,12 +631,44 @@
               <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="AuthModule" />
+              <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="Controller" />
+              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
       <pane id="Scope" />
-      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -610,6 +709,18 @@
       <recent name="$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/otherViews" />
     </key>
   </component>
+  <component name="RunDashboard">
+    <option name="ruleStates">
+      <list>
+        <RuleState>
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
+        </RuleState>
+        <RuleState>
+          <option name="name" value="StatusDashboardGroupingRule" />
+        </RuleState>
+      </list>
+    </option>
+  </component>
   <component name="RunManager" selected="Tomcat Server.Tomcat">
     <configuration default="true" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" ALTERNATIVE_JRE_ENABLED="false">
       <deployment />
@@ -904,6 +1015,13 @@
       <envs />
       <method />
     </configuration>
+    <configuration default="true" type="JavaScriptTestRunnerJest" factoryName="Jest">
+      <node-interpreter value="project" />
+      <working-dir value="" />
+      <envs />
+      <scope-kind value="ALL" />
+      <method />
+    </configuration>
     <configuration default="true" type="JavaScriptTestRunnerProtractor" factoryName="Protractor">
       <config-file value="" />
       <node-interpreter value="project" />
@@ -1134,7 +1252,15 @@
       <workItem from="1489177273156" duration="210000" />
       <workItem from="1489177895969" duration="1024000" />
       <workItem from="1489244483211" duration="336000" />
-      <workItem from="1490297725927" duration="3128000" />
+      <workItem from="1490297725927" duration="3815000" />
+      <workItem from="1490453027182" duration="32000" />
+      <workItem from="1490708442876" duration="356000" />
+      <workItem from="1490728842737" duration="1936000" />
+      <workItem from="1490771885762" duration="18000" />
+      <workItem from="1490774240179" duration="30000" />
+      <workItem from="1490786391193" duration="640000" />
+      <workItem from="1491073809098" duration="64000" />
+      <workItem from="1491502176685" duration="1059000" />
     </task>
     <task id="LOCAL-00001" summary="Commit with additional data entities">
       <created>1488992203414</created>
@@ -1157,14 +1283,21 @@
       <option name="project" value="LOCAL" />
       <updated>1489178302446</updated>
     </task>
-    <option name="localTasksCounter" value="4" />
+    <task id="LOCAL-00004" summary="Add some staff">
+      <created>1490300884516</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1490300884516</updated>
+    </task>
+    <option name="localTasksCounter" value="5" />
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="88683000" />
+    <option name="totallyTimeSpent" value="93505000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="65" y="24" width="1855" height="1056" extended-state="6" />
+    <frame x="65" y="-4" width="1855" height="1084" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info id="Palette" 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" />
@@ -1180,15 +1313,15 @@
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
       <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="true" show_stripe_button="true" weight="0.39979014" sideWeight="0.5" order="3" 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="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32925585" 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="true" show_stripe_button="true" weight="0.32925585" 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" />
@@ -1215,7 +1348,8 @@
     <MESSAGE value="Commit with additional data entities" />
     <MESSAGE value="Connect with new db tables + some operations with db" />
     <MESSAGE value="Small changes in structure" />
-    <option name="LAST_COMMIT_MESSAGE" value="Small changes in structure" />
+    <MESSAGE value="Add some staff" />
+    <option name="LAST_COMMIT_MESSAGE" value="Add some staff" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
@@ -1242,49 +1376,6 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/pom.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="216">
-          <caret line="12" column="0" lean-forward="false" selection-start-line="12" selection-start-column="0" selection-end-line="12" selection-end-column="0" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/errorView.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="13" column="51" lean-forward="false" selection-start-line="13" selection-start-column="51" selection-end-line="13" selection-end-column="51" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ClientsEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="396">
-          <caret line="22" column="33" lean-forward="false" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ModeratorsEntity.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="162">
-          <caret line="19" column="34" lean-forward="false" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" />
-        </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">
-          <caret line="27" column="7" lean-forward="true" selection-start-line="27" selection-start-column="7" selection-end-line="27" selection-end-column="7" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/ProjectsEntity.hbm.xml">
-      <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" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/ClientsDao.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="759">
@@ -1292,13 +1383,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/AdminDao.java">
-      <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" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientChangeInfo.jsp">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="18">
@@ -1306,13 +1390,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-78">
-          <caret line="1" column="0" lean-forward="false" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/ServiceEntites/SelectProject.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="144">
@@ -1341,13 +1418,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/AdminMovController.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="522">
-          <caret line="37" column="5" lean-forward="false" selection-start-line="19" selection-start-column="4" selection-end-line="37" selection-end-column="5" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/Project_skil_catEntity.hbm.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="288">
@@ -1404,13 +1474,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/ModeratorsEntity.hbm.xml">
-      <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" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/StudentListSkills.hbm.xml">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="90">
@@ -1453,14 +1516,6 @@
         </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">
@@ -1479,7 +1534,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <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>
@@ -1487,7 +1541,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="142">
           <caret line="127" column="55" lean-forward="true" selection-start-line="127" selection-start-column="55" selection-end-line="127" selection-end-column="55" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1495,7 +1548,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="168">
           <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>
@@ -1503,7 +1555,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="180">
           <caret line="37" column="81" lean-forward="false" selection-start-line="37" selection-start-column="81" selection-end-line="37" selection-end-column="81" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1511,7 +1562,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="282">
           <caret line="49" column="78" lean-forward="false" selection-start-line="49" selection-start-column="78" selection-end-line="49" selection-end-column="78" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1519,7 +1569,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="161">
           <caret line="85" column="0" lean-forward="false" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1527,7 +1576,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="359">
           <caret line="494" column="0" lean-forward="false" selection-start-line="494" selection-start-column="0" selection-end-line="494" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1535,7 +1583,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
           <caret line="37" column="0" lean-forward="false" selection-start-line="37" selection-start-column="0" selection-end-line="37" selection-end-column="0" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1543,82 +1590,228 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="161">
           <caret line="478" column="0" lean-forward="false" selection-start-line="478" selection-start-column="0" selection-end-line="478" selection-end-column="0" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.6.RELEASE/spring-web-4.3.6.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="119" column="0" lean-forward="false" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        </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="700">
+          <caret line="44" column="0" lean-forward="false" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
+          <folding>
+            <element signature="imports" expanded="false" />
+          </folding>
+        </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="220">
+          <caret line="11" column="28" lean-forward="false" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/studentPersCab.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="320">
+          <caret line="16" column="0" lean-forward="false" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateUtil/HibernateUtil.java">
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientPersCab.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="252">
-          <caret line="17" column="0" lean-forward="false" selection-start-line="17" selection-start-column="0" selection-end-line="17" selection-end-column="0" />
+        <state relative-caret-position="1600">
+          <caret line="80" column="50" lean-forward="false" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="jar://$MAVEN_REPOSITORY$/org/springframework/spring-web/4.3.6.RELEASE/spring-web-4.3.6.RELEASE.jar!/org/springframework/web/method/support/InvocableHandlerMethod.class">
+    <entry file="file://$PROJECT_DIR$/DBModule/pom.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="180">
-          <caret line="119" column="0" lean-forward="false" selection-start-line="119" selection-start-column="0" selection-end-line="119" selection-end-column="0" />
+        <state relative-caret-position="560">
+          <caret line="28" column="35" lean-forward="false" selection-start-line="28" selection-start-column="21" selection-end-line="28" selection-end-column="35" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java">
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ClientsEntity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="450">
-          <caret line="44" column="0" lean-forward="false" selection-start-line="44" selection-start-column="0" selection-end-line="44" selection-end-column="0" />
+        <state relative-caret-position="440">
+          <caret line="22" column="33" lean-forward="false" selection-start-line="22" selection-start-column="33" selection-end-line="22" selection-end-column="33" />
+          <folding>
+            <element signature="e#937#938#0" expanded="false" />
+            <element signature="e#967#968#0" expanded="false" />
+            <element signature="e#1013#1014#0" expanded="false" />
+            <element signature="e#1051#1052#0" expanded="false" />
+            <element signature="e#1142#1143#0" expanded="false" />
+            <element signature="e#1172#1173#0" expanded="false" />
+            <element signature="e#1218#1219#0" expanded="false" />
+            <element signature="e#1256#1257#0" expanded="false" />
+            <element signature="e#1350#1351#0" expanded="false" />
+            <element signature="e#1382#1383#0" expanded="false" />
+            <element signature="e#1432#1433#0" expanded="false" />
+            <element signature="e#1474#1475#0" expanded="false" />
+            <element signature="e#1560#1561#0" expanded="false" />
+            <element signature="e#1588#1589#0" expanded="false" />
+            <element signature="e#1630#1631#0" expanded="false" />
+            <element signature="e#1664#1665#0" expanded="false" />
+            <element signature="e#1760#1761#0" expanded="false" />
+            <element signature="e#1793#1794#0" expanded="false" />
+            <element signature="e#1845#1846#0" expanded="false" />
+            <element signature="e#1889#1890#0" expanded="false" />
+            <element signature="e#1987#1988#0" expanded="false" />
+            <element signature="e#2021#2022#0" expanded="false" />
+            <element signature="e#2075#2076#0" expanded="false" />
+            <element signature="e#2121#2122#0" expanded="false" />
+            <element signature="e#2211#2212#0" expanded="false" />
+            <element signature="e#2242#2243#0" expanded="false" />
+            <element signature="e#2287#2288#0" expanded="false" />
+            <element signature="e#2327#2328#0" expanded="false" />
+            <element signature="e#2435#2436#0" expanded="false" />
+            <element signature="e#2466#2467#0" expanded="false" />
+            <element signature="e#2514#2515#0" expanded="false" />
+            <element signature="e#2554#2555#0" expanded="false" />
+            <element signature="e#2669#2670#0" expanded="false" />
+            <element signature="e#2703#2704#0" expanded="false" />
+            <element signature="e#2757#2758#0" expanded="false" />
+            <element signature="e#2803#2804#0" expanded="false" />
+            <element signature="e#2914#2915#0" expanded="false" />
+            <element signature="e#2946#2947#0" expanded="false" />
+            <element signature="e#2996#2997#0" expanded="false" />
+            <element signature="e#3038#3039#0" expanded="false" />
+            <element signature="e#3150#3151#0" expanded="false" />
+            <element signature="e#3183#3184#0" expanded="false" />
+            <element signature="e#3235#3236#0" expanded="false" />
+            <element signature="e#3279#3280#0" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateUtil/HibernateUtil.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="140">
+          <caret line="10" column="0" lean-forward="false" selection-start-line="10" selection-start-column="0" selection-end-line="27" selection-end-column="1" />
+          <folding>
+            <element signature="imports" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/UsersDao.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="440">
+          <caret line="29" column="25" lean-forward="false" selection-start-line="29" selection-start-column="25" selection-end-line="29" selection-end-column="25" />
+          <folding>
+            <element signature="imports" expanded="false" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/ModeratorsEntity.hbm.xml">
+      <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>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/StudentsEntity.java">
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/hibernate.cfg.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="198">
-          <caret line="11" column="28" lean-forward="true" selection-start-line="11" selection-start-column="28" selection-end-line="11" selection-end-column="28" />
+        <state relative-caret-position="220">
+          <caret line="11" column="78" lean-forward="false" selection-start-line="8" selection-start-column="6" selection-end-line="11" selection-end-column="78" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/studentPersCab.jsp">
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/loginViews/studentBar.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="288">
-          <caret line="16" column="0" lean-forward="true" selection-start-line="16" selection-start-column="0" selection-end-line="16" selection-end-column="0" />
+        <state relative-caret-position="367">
+          <caret line="97" column="65" lean-forward="false" selection-start-line="97" selection-start-column="65" selection-end-line="97" selection-end-column="65" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/LoginController.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="479">
+        <state relative-caret-position="2534">
           <caret line="169" column="0" lean-forward="false" selection-start-line="169" selection-start-column="0" selection-end-line="169" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/loginViews/studentBar.jsp">
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="97" column="0" lean-forward="false" selection-start-line="97" selection-start-column="0" selection-end-line="97" selection-end-column="0" />
+        <state relative-caret-position="145">
+          <caret line="278" column="8" lean-forward="false" selection-start-line="278" selection-start-column="8" selection-end-line="278" selection-end-column="8" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="1560">
+          <caret line="78" column="0" lean-forward="false" selection-start-line="78" selection-start-column="0" selection-end-line="78" selection-end-column="0" />
+          <folding>
+            <element signature="e#3331#3337#0#HTML" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="191">
-          <caret line="21" column="16" lean-forward="false" selection-start-line="21" selection-start-column="16" selection-end-line="21" selection-end-column="16" />
-          <folding />
+        <state relative-caret-position="885">
+          <caret line="83" column="7" lean-forward="false" selection-start-line="83" selection-start-column="7" selection-end-line="83" selection-end-column="7" />
+          <folding>
+            <element signature="e#3333#3339#0#HTML" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/clientPersCab.jsp">
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/moderatorViews/mainWindowProject.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="885">
+          <caret line="82" column="0" lean-forward="false" selection-start-line="82" selection-start-column="0" selection-end-line="82" selection-end-column="0" />
+          <folding>
+            <element signature="e#3105#3111#0#HTML" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/moderatorViews/startPageModerator.jsp">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="885">
+          <caret line="95" column="0" lean-forward="false" selection-start-line="95" selection-start-column="0" selection-end-line="95" selection-end-column="0" />
+          <folding>
+            <element signature="e#3672#3678#0#HTML" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/AdminDao.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="295">
-          <caret line="80" column="50" lean-forward="true" selection-start-line="80" selection-start-column="50" selection-end-line="80" selection-end-column="50" />
+        <state relative-caret-position="760">
+          <caret line="57" column="35" lean-forward="false" selection-start-line="57" selection-start-column="35" selection-end-line="57" selection-end-column="35" />
           <folding />
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/AdminMovController.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="220">
+          <caret line="41" column="41" lean-forward="false" selection-start-line="41" selection-start-column="29" selection-end-line="41" selection-end-column="41" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
   </component>
   <component name="masterDetails">
     <states>

+ 1 - 1
AuthModule/AuthModule.iml

@@ -15,7 +15,7 @@
       <configuration />
     </facet>
   </component>
-  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
     <output url="file://$MODULE_DIR$/target/classes" />
     <output-test url="file://$MODULE_DIR$/target/test-classes" />
     <content url="file://$MODULE_DIR$">

+ 25 - 1
AuthModule/src/main/java/Controller/AdminMovController.java

@@ -1,6 +1,7 @@
 package Controller;
 
 import HibernateEntities.ModeratorsEntity;
+import HibernateEntities.ProjectsEntity;
 import ServiceEntites.AddInfEnt;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -8,6 +9,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.SessionAttributes;
 import org.springframework.web.servlet.ModelAndView;
 
+import static DAOImplement.AdminDao.getAdminProject;
 import static DAOImplement.AdminDao.updateAdmin;
 
 /**
@@ -40,7 +42,8 @@ public class AdminMovController {
     @RequestMapping(value = "/PCabinAdmin")
     public ModelAndView adminPersonalCabinetGenerator(@ModelAttribute("Admin") ModeratorsEntity admin) {
         try {
-            ModelAndView adminPersCabinet = new ModelAndView("inViews/persCabViews/adminPersCab");
+            ModelAndView adminPersCabinet = new ModelAndView("moderatorViews/startPageModerator");
+            adminPersCabinet.addObject("projectList", getAdminProject(admin));
             return adminPersCabinet;
         } catch (Exception ex) {
             return new ModelAndView("otherViews/errorView");
@@ -72,4 +75,25 @@ public class AdminMovController {
             return new ModelAndView("otherViews/errorView");
         }
     }
+
+    @RequestMapping(value = "/PPersCabinAdmin")
+    public ModelAndView adminPersonalCabinet(@ModelAttribute("Admin") ModeratorsEntity admin) {
+        try {
+            ModelAndView adminPersCabinet1 = new ModelAndView("inViews/persCabViews/adminPersCab");
+            return adminPersCabinet1;
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
+
+    @RequestMapping(value = "/PmainWindowProjectAdmin")
+    public ModelAndView mainWindowProjectAdmin(@ModelAttribute("Admin") ModeratorsEntity admin) {
+        try {
+            ModelAndView adminPersCabinet2 = new ModelAndView("moderatorViews/mainWindowProject");
+            adminPersCabinet2.addObject("projectList", getAdminProject(admin));
+            return adminPersCabinet2;
+        } catch (Exception ex) {
+            return new ModelAndView("otherViews/errorView");
+        }
+    }
 }

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

@@ -241,7 +241,7 @@ body > .container {
 
 @media (max-width: 767px) {
 
-    .nav-masthead{
+    .nav-masthead {
         float: none;
     }
 
@@ -255,10 +255,12 @@ body > .container {
         margin: 0 auto;
         margin-top: 100px;
     }
-    .nav-link{
+
+    .nav-link {
         margin-top: 10px;
     }
-    .login-block form select{
+
+    .login-block form select {
         width: 100%;
         height: 42px;
         box-sizing: border-box;
@@ -272,4 +274,39 @@ body > .container {
         background: #fff url('http://i.imgur.com/u0XmBmv.png') 20px top no-repeat;
         background-size: 16px 80px;
     }
+
+    .header h1 {
+        color: darkblue !important;
+        font-size: 120%;
+        letter-spacing: 1px;
+    }
+
+    .shadow {
+        box-shadow: 3px 3px 8px #636c72;
+        border-radius: 10px;
+        margin: 0px 10px;
+        font-size: 150%;
+    }
+
+    .table {
+        font-family: "Lucida Sans Unicode", "Lucida Grande", Sans-Serif;
+        font-size: 14px;
+        border-collapse: collapse;
+        text-align: center;
+    }
+
+    th, td {
+        border-style: solid;
+        border-width: 0 1px 1px 0;
+        border-color: white;
+    }
+
+    th {
+        color: midnightblue;
+        background: lightblue;
+    }
+
+    td {
+        background: #D8E6F3;
+    }
 }

+ 48 - 26
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminChangeInfo.jsp

@@ -1,22 +1,14 @@
 <%@ 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>
+    <title> Personal Admin 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>
@@ -28,29 +20,59 @@
         </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/>
-            <form:input path="e_mail" type="email" value="" placeholder="${Admin.modEmail}" id="email"/>${emailMessage}<br/>
-            <form:input path="phone_number" type="text" placeholder="${Admin.modPhone}"/>${phoneMessage}<br/>
-            <form:input path="hometown" type="text" placeholder="${Admin.modHometown}"/>${hometownMessage}<br/>
-            <form:button> Изменить данные </form:button>
-            ${errorMessage}
-        </form:form>
-        <a href="/PCabinAdmin">Отмена</a>
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                ${Admin.modFamily}
+                ${Admin.modFirstName}
+                ${Admin.modSecName}
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+<div class="wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""> <a href="/PCabinAdmin">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с клиентом</a> </li>
+                        <li class=""><a href="#">Мои приглашения в проект</a> </li>
+                        <li class=""><a href="/PPersCabinAdmin">Профиль</a> </li>
+                        <li class=""><a href="#">Сообщество</a> </li>
+                        <li class=""><a href="/">Выход</a> </li>
+                    </form>
+                </div>
+            </div>
+            <div class="col-lg-9 col-lg-push-3">
+                <div class="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/>
+                            <form:input path="e_mail" type="email" value="" placeholder="${Admin.modEmail}" id="email"/>${emailMessage}<br/>
+                            <form:input path="phone_number" type="text" placeholder="${Admin.modPhone}"/>${phoneMessage}<br/>
+                            <form:input path="hometown" type="text" placeholder="${Admin.modHometown}"/>${hometownMessage}<br/>
+                            <form:button> Изменить данные </form:button>
+                            ${errorMessage}
+                        </form:form>
+                        <a href="/PCabinAdmin">Отмена</a>
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 </div>
-
 <footer class="footer">
     <div class="container">
         <p class="text-muted">&copy;2017 Mephorce</p>
     </div>
 </footer>
-
 </body>
 </html>

+ 55 - 34
AuthModule/src/main/webapp/WEB-INF/views/inViews/persCabViews/adminPersCab.jsp

@@ -1,13 +1,6 @@
-<%--
-  Created by IntelliJ IDEA.
-  User: kinetik
-  Date: 05.03.17
-  Time: 22:14
-  To change this template use File | Settings | File Templates.
---%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ page contentType="text/html;charset=UTF-8" language="java" %>
 <html>
-
 <head>
     <title> Personal Admin Page </title>
     <style type="text/css">
@@ -15,49 +8,77 @@
         <%@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 active" href="/">Войти</a>
+            <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="personal-page-block">
-        <h1> Персональная информация </h1>
-        <b>Фамилия:</b> ${Admin.modFamily} <br>
-        <b>Имя:</b> ${Admin.modFirstName} <br>
-        <b>Отчество:</b> ${Admin.modSecName} <br>
-        <c:if test="${not empty Admin.modBirthdate}">
-        <b>Дата рождения:</b> ${Admin.modBirthdate} <br>
-        </c:if>
-        <c:if test="${not empty Admin.modPhone}">
-        <b>Номер телефона:</b> ${Admin.modPhone} <br>
-        </c:if>
-        <c:if test="${not empty Admin.modEmail}">
-        <b>E-mail адрес:</b> ${Admin.modEmail} <br>
-        </c:if>
-        <c:if test="${not empty Admin.modHometown}">
-        <b>Город:</b> ${Admin.modHometown} <br>
-        </c:if>
-        <br>
-        <a href="/PAdminChangeInfo">Изменить</a>
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                ${Admin.modFamily}
+                ${Admin.modFirstName}
+                ${Admin.modSecName}
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+<div class="wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""> <a href="/PCabinAdmin">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с клиентом</a> </li>
+                        <li class=""><a href="#">Мои приглашения в проект</a> </li>
+                        <li class=""><a href="/PPersCabinAdmin">Профиль</a> </li>
+                        <li class=""><a href="#">Сообщество</a> </li>
+                        <li class=""><a href="/">Выход</a> </li>
+                    </form>
+                </div>
+            </div>
+            <div class="col-lg-9 col-lg-push-3">
+                <div class="container">
+                    <div class="personal-page-block">
+                        <h1> Персональная информация </h1>
+                        <b>Фамилия:</b> ${Admin.modFamily} <br>
+                        <b>Имя:</b> ${Admin.modFirstName} <br>
+                        <b>Отчество:</b> ${Admin.modSecName} <br>
+                        <c:if test="${not empty Admin.modBirthdate}">
+                            <b>Дата рождения:</b> ${Admin.modBirthdate} <br>
+                        </c:if>
+                        <c:if test="${not empty Admin.modPhone}">
+                            <b>Номер телефона:</b> ${Admin.modPhone} <br>
+                        </c:if>
+                        <c:if test="${not empty Admin.modEmail}">
+                            <b>E-mail адрес:</b> ${Admin.modEmail} <br>
+                        </c:if>
+                        <c:if test="${not empty Admin.modHometown}">
+                            <b>Город:</b> ${Admin.modHometown} <br>
+                        </c:if>
+                        <br>
+                        <a href="/PAdminChangeInfo">Изменить</a>
+                    </div>
+                </div>
+            </div>
+        </div>
     </div>
 </div>
-
 <footer class="footer">
     <div class="container">
         <p class="text-muted">&copy;2017 Mephorce</p>
     </div>
 </footer>
-
 </body>
 </html>

+ 82 - 0
AuthModule/src/main/webapp/WEB-INF/views/moderatorViews/mainWindowProject.jsp

@@ -0,0 +1,82 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%--
+  Created by IntelliJ IDEA.
+  User: Александр
+  Date: 26.03.2017
+  Time: 15:07
+  To change this template use File | Settings | File Templates.
+--%>
+<%@ page contentType="text/html;charset=UTF-8" language="java" %>
+<html>
+<head>
+    <title> Personal Admin Page </title>
+    <style type="text/css">
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/cssforpr.css" %>
+        <%@include file="/WEB-INF/bootstrap-4.0.0-alpha.6-dist/css/bootstrap.min.css" %>
+    </style>
+</head>
+<body>
+<nav class="navbar navbar-default navbar-fixed-top">
+    <div class="container">
+        <a class="navbar-brand" href="#">MePhorce</a>
+        <nav class="nav nav-masthead">
+            <a class="nav-link" href="/">Войти</a>
+            <a class="nav-link" href="/aboutUs">О проекте</a>
+            <a class="nav-link" href="/registrate">Создать аккаунт</a>
+            <a class="nav-link" href="/contacts">Контакты</a>
+        </nav>
+    </div>
+</nav>
+<div class="col-lg-12">
+    <div class="navbar-header header">
+        <center>
+            <h1>
+                ${Admin.modFamily}
+                ${Admin.modFirstName}
+                ${Admin.modSecName}
+            </h1>
+        </center>
+        <hr>
+    </div>
+</div>
+<div class="wrapper">
+    <div class="container">
+        <div class="row">
+            <div class="col-lg-3 col-lg-pull-9">
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Меню</div>
+                        <li class=""> <a href="/PCabinAdmin">Мои проекты</a></li>
+                        <li class=""><a href="#">Чат с клиентом</a> </li>
+                        <li class=""><a href="#">Мои приглашения в проект</a> </li>
+                        <li class=""><a href="/PPersCabinAdmin">Профиль</a> </li>
+                        <li class=""><a href="#">Сообщество</a> </li>
+                        <li class=""><a href="/">Выход</a> </li>
+                    </form>
+                </div>
+                <hr>
+                <div class="btn-group btn-group-vertical">
+                    <form>
+                        <div class="sidebar-header alert alert-info ">Проектное меню</div>
+                        <li class=""> <a href="PmainWindowProjectAdmin">Общая информация по проекту</a></li>
+                        <li class=""><a href="#">Декомпозиция проекта</a> </li>
+                        <li class=""><a href="#">Исполнение проекта</a> </li>
+                        <li class=""><a href="#">Сборка проекта</a> </li>
+                        <li class=""><a href="#">Сдача проекта</a> </li>
+                    </form>
+                </div>
+            </div>
+            <div class="col-lg-9 col-lg-push-3">
+            </div>
+        </div>
+    </div>
+</div>
+<footer class="footer">
+    <div class="container">
+        <p class="text-muted">&copy;2017 Mephorce</p>
+    </div>
+</footer>
+</body>
+</html>

+ 96 - 0
AuthModule/src/main/webapp/WEB-INF/views/moderatorViews/startPageModerator.jsp

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

+ 12 - 1
DBModule/DBModule.iml

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

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

@@ -1,6 +1,7 @@
 package DAOImplement;
 
 import HibernateEntities.ModeratorsEntity;
+import HibernateEntities.ProjectsEntity;
 import org.hibernate.Session;
 import org.hibernate.query.Query;
 
@@ -54,6 +55,14 @@ public class AdminDao {
         session.getTransaction().commit();
         session.close();
     }
+    public static List<ProjectsEntity> getAdminProject(ModeratorsEntity admin) {
+        Session session = getSession();
+        Query query = session.createQuery("FROM ProjectsEntity Where clId = :modId");
+        query.setParameter("modId", admin.getModId());
+        List<ProjectsEntity> res = query.list();
+        session.close();
+        return res;
+    }
     public static boolean checkIsAdmin(ModeratorsEntity admin){
         Session session = getSession();
         Query query = session.createQuery("FROM ModeratorsEntity WHERE modFamily = :Family and modFirstName = :Name and modSecName = :SecondName");