|
@@ -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	" 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>
|