Connect with new db tables + some operations with db

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

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

.idea/workspace.xml

@@ -1,8 +1,19 @@
 <?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="">
+    <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" />
       <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" />
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -30,33 +41,52 @@
   </component>
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
-    <leaf>
-      <file leaf-file-name="hibernate.cfg.xml" pinned="false" current-in-tab="false">
+    <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">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="582">
-              <caret line="36" column="52" lean-forward="false" selection-start-line="36" selection-start-column="52" selection-end-line="36" selection-end-column="52" />
+            <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>
       </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="ModerListSkills.hbm.xml" pinned="false" current-in-tab="false">
+        <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="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+              <caret line="16" column="82" lean-forward="false" selection-start-line="16" selection-start-column="82" selection-end-line="16" selection-end-column="82" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Project_mod_skillEntity.hbm.xml" pinned="false" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/Project_mod_skillEntity.hbm.xml">
+      <file leaf-file-name="ModeratorListSkills.java" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ModeratorListSkills.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="126">
-              <caret line="7" column="69" lean-forward="false" selection-start-line="7" selection-start-column="69" selection-end-line="7" selection-end-column="69" />
-              <folding />
+            <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>
           </provider>
         </entry>
@@ -90,11 +120,6 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/RegModule/src/main/webapp/WEB-INF/views/otherViews/errorView.jsp" />
-        <option value="$PROJECT_DIR$/PCabinModule/pom.xml" />
-        <option value="$PROJECT_DIR$/PCabinModule/web/WEB-INF/web.xml" />
-        <option value="$PROJECT_DIR$/PCabinModule/web/WEB-INF/applicationContext.xml" />
-        <option value="$PROJECT_DIR$/PCabinModule/web/WEB-INF/dispatcher-servlet.xml" />
         <option value="$PROJECT_DIR$/RegModule/src/main/java/ServiceEntities/RegStudent.java" />
         <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" />
@@ -133,14 +158,19 @@
         <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" />
         <option value="$PROJECT_DIR$/DBModule/src/main/resources/Skil_listEntity.hbm.xml" />
-        <option value="$PROJECT_DIR$/DBModule/src/main/resources/Skil_matchEntity.hbm.xml" />
-        <option value="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/MatchSkilEntity.java" />
         <option value="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ProjectSkillCatEntity.java" />
-        <option value="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ProjectStaffSkillEntity.java" />
         <option value="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/SkillListEntity.java" />
         <option value="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/SkillCatEntity.java" />
-        <option value="$PROJECT_DIR$/DBModule/src/main/resources/hibernate.cfg.xml" />
+        <option value="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/MatchSkilEntity.java" />
+        <option value="$PROJECT_DIR$/DBModule/src/main/resources/Skil_matchEntity.hbm.xml" />
+        <option value="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ProjectStaffSkillEntity.java" />
         <option value="$PROJECT_DIR$/DBModule/src/main/resources/Project_mod_skillEntity.hbm.xml" />
+        <option value="$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/SkillDao.java" />
+        <option value="$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/StudentListSkills.java" />
+        <option value="$PROJECT_DIR$/DBModule/src/main/resources/StudentListSkills.hbm.xml" />
+        <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" />
       </list>
     </option>
   </component>
@@ -188,7 +218,7 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="PackagesPane" />
+      <pane id="Scratches" />
       <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
@@ -267,10 +297,6 @@
               <option name="myItemId" value="java" />
               <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
             </PATH_ELEMENT>
-            <PATH_ELEMENT>
-              <option name="myItemId" value="HibernateUtil" />
-              <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
-            </PATH_ELEMENT>
           </PATH>
           <PATH>
             <PATH_ELEMENT>
@@ -327,10 +353,14 @@
               <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="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+            </PATH_ELEMENT>
           </PATH>
         </subPane>
       </pane>
-      <pane id="Scratches" />
+      <pane id="PackagesPane" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -886,6 +916,7 @@
       <workItem from="1488916407301" duration="361000" />
       <workItem from="1488916779437" duration="157000" />
       <workItem from="1488991431614" duration="914000" />
+      <workItem from="1488996830624" duration="5230000" />
     </task>
     <task id="LOCAL-00001" summary="Commit with additional data entities">
       <created>1488992203414</created>
@@ -898,7 +929,7 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="75977000" />
+    <option name="totallyTimeSpent" value="81207000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="65" y="24" width="1855" height="1056" extended-state="6" />
@@ -919,7 +950,6 @@
       <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.39979014" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
-      <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32984293" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
       <window_info id="Palette&#9;" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Image Layers" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
       <window_info id="Java Enterprise" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@@ -929,7 +959,7 @@
       <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" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24905661" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.24905661" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Web" 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" />
       <window_info id="Theme Preview" 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="Favorites" 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" />
@@ -937,6 +967,7 @@
       <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>
@@ -983,43 +1014,10 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/ModeratorsEntity.hbm.xml">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="630">
-          <caret line="35" column="72" lean-forward="false" selection-start-line="35" selection-start-column="72" selection-end-line="35" selection-end-column="72" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/RegModule/src/main/java/Controller/RegistrationController.java" />
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/otherViews/accessDeniedView.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="234">
-          <caret line="13" column="49" lean-forward="false" selection-start-line="13" selection-start-column="49" selection-end-line="13" selection-end-column="49" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/PCabinetController.java" />
-    <entry file="file://$PROJECT_DIR$/RegModule/src/main/webapp/WEB-INF/views/registrationViews/regAdminPage.jsp" />
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/webapp/WEB-INF/views/loginViews/adminBar.jsp">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="414">
-          <caret line="23" column="27" lean-forward="true" selection-start-line="23" selection-start-column="27" selection-end-line="23" selection-end-column="27" />
-        </state>
-      </provider>
-    </entry>
-    <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/ServiceEntites/AddInfEnt.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="108">
-          <caret line="6" column="28" lean-forward="false" selection-start-line="6" selection-start-column="19" selection-end-line="6" selection-end-column="28" />
-        </state>
-      </provider>
-    </entry>
     <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" />
-          <folding />
         </state>
       </provider>
     </entry>
@@ -1255,143 +1253,217 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/Skil_matchEntity.hbm.xml">
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ProjectSkillCatEntity.java">
       <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 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>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/MatchSkilEntity.java">
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/SkillListEntity.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="720">
-          <caret line="40" column="0" lean-forward="true" selection-start-line="40" selection-start-column="0" selection-end-line="40" selection-end-column="0" />
+        <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#361#362#0" expanded="true" />
-            <element signature="e#389#390#0" expanded="true" />
-            <element signature="e#431#432#0" expanded="true" />
-            <element signature="e#465#466#0" expanded="true" />
-            <element signature="e#557#558#0" expanded="true" />
-            <element signature="e#586#587#0" expanded="true" />
-            <element signature="e#630#631#0" expanded="true" />
-            <element signature="e#666#667#0" expanded="true" />
-            <element signature="e#756#757#0" expanded="true" />
-            <element signature="e#786#787#0" expanded="true" />
-            <element signature="e#816#817#0" expanded="true" />
-            <element signature="e#915#916#0" expanded="true" />
-            <element signature="e#960#961#0" expanded="true" />
-            <element signature="e#998#999#0" expanded="true" />
+            <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>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ProjectSkillCatEntity.java">
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/SkillCatEntity.java">
       <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" />
+        <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#363#364#0" expanded="true" />
-            <element signature="e#391#392#0" expanded="true" />
-            <element signature="e#432#433#0" expanded="true" />
-            <element signature="e#466#467#0" expanded="true" />
-            <element signature="e#494#495#0" expanded="true" />
-            <element signature="e#593#594#0" expanded="true" />
-            <element signature="e#686#687#0" expanded="true" />
-            <element signature="e#713#714#0" expanded="true" />
-            <element signature="e#753#754#0" expanded="true" />
-            <element signature="e#785#786#0" expanded="true" />
-            <element signature="e#884#885#0" expanded="true" />
-            <element signature="e#916#917#0" expanded="true" />
-            <element signature="e#966#967#0" expanded="true" />
-            <element signature="e#1008#1009#0" expanded="true" />
+            <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>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ProjectStaffSkillEntity.java">
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateUtil/HibernateUtil.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="546">
-          <caret line="56" column="1" lean-forward="false" selection-start-line="56" selection-start-column="1" selection-end-line="56" selection-end-column="1" />
+        <state relative-caret-position="288">
+          <caret line="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
           <folding>
-            <element signature="e#425#426#0" expanded="true" />
-            <element signature="e#453#454#0" expanded="true" />
-            <element signature="e#494#495#0" expanded="true" />
-            <element signature="e#528#529#0" expanded="true" />
-            <element signature="e#789#790#0" expanded="true" />
-            <element signature="e#818#819#0" expanded="true" />
-            <element signature="e#862#863#0" expanded="true" />
-            <element signature="e#898#899#0" expanded="true" />
-            <element signature="e#991#992#0" expanded="true" />
-            <element signature="e#1021#1022#0" expanded="true" />
-            <element signature="e#1067#1068#0" expanded="true" />
-            <element signature="e#1105#1106#0" expanded="true" />
-            <element signature="e#1199#1200#0" expanded="true" />
-            <element signature="e#1229#1230#0" expanded="true" />
-            <element signature="e#1275#1276#0" expanded="true" />
-            <element signature="e#1313#1314#0" expanded="true" />
-            <element signature="e#1406#1407#0" expanded="true" />
-            <element signature="e#1437#1438#0" expanded="true" />
-            <element signature="e#1485#1486#0" expanded="true" />
-            <element signature="e#1525#1526#0" expanded="true" />
+            <element signature="imports" expanded="false" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/SkillListEntity.java">
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/GroupDao.java">
       <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" />
+        <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="e#327#328#0" expanded="true" />
-            <element signature="e#356#357#0" expanded="true" />
-            <element signature="e#400#401#0" expanded="true" />
-            <element signature="e#436#437#0" expanded="true" />
-            <element signature="e#531#532#0" expanded="true" />
-            <element signature="e#562#563#0" expanded="true" />
-            <element signature="e#609#610#0" expanded="true" />
-            <element signature="e#649#650#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/SkillCatEntity.java">
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/Project_mod_skillEntity.hbm.xml">
       <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" />
+        <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>
+    <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/resources/StudentListSkills.hbm.xml">
+      <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>
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/DAOImplement/SkillDao.java">
+      <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="e#326#327#0" expanded="true" />
-            <element signature="e#354#355#0" expanded="true" />
-            <element signature="e#396#397#0" expanded="true" />
-            <element signature="e#430#431#0" expanded="true" />
-            <element signature="e#528#529#0" expanded="true" />
-            <element signature="e#558#559#0" expanded="true" />
-            <element signature="e#603#604#0" expanded="true" />
-            <element signature="e#641#642#0" expanded="true" />
+            <element signature="imports" expanded="true" />
           </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/hibernate.cfg.xml">
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/MatchSkilEntity.java">
+      <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>
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/Skil_matchEntity.hbm.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="582">
-          <caret line="36" column="52" lean-forward="false" selection-start-line="36" selection-start-column="52" selection-end-line="36" selection-end-column="52" />
+        <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>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateUtil/HibernateUtil.java">
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/ProjectStaffSkillEntity.java">
+      <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>
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/java/HibernateEntities/StudentListSkills.java">
+      <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/java/HibernateEntities/ModeratorListSkills.java">
+      <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>
+      </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="19" column="0" lean-forward="false" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
+          <caret line="16" column="82" lean-forward="false" selection-start-line="16" selection-start-column="82" selection-end-line="16" selection-end-column="82" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/Project_mod_skillEntity.hbm.xml">
+    <entry file="file://$PROJECT_DIR$/DBModule/src/main/resources/hibernate.cfg.xml">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="126">
-          <caret line="7" column="69" lean-forward="false" selection-start-line="7" selection-start-column="69" selection-end-line="7" selection-end-column="69" />
+        <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>

DBModule/src/main/java/DAOImplement/SkillDao.java

@@ -0,0 +1,53 @@
+package DAOImplement;
+
+import HibernateEntities.MatchSkilEntity;
+import HibernateEntities.ProjectStaffSkillEntity;
+import HibernateEntities.SkillCatEntity;
+import HibernateEntities.SkillListEntity;
+import org.hibernate.Session;
+import org.hibernate.query.Query;
+
+import java.util.List;
+
+import static HibernateUtil.HibernateUtil.getSession;
+
+/**
+ * Created by kinetik on 08.03.17.
+ */
+public class SkillDao {
+
+    public static SkillListEntity getSkillById (int id) {
+        Session session = getSession();
+        Query query = session.createQuery("From SkillListEntity where skilId = :skillId");
+        query.setParameter("skillId", id);
+        List<SkillListEntity> res = query.list();
+        session.close();
+        return res.get(0);
+    }
+
+    public static List<MatchSkilEntity> getSkillsByCatId (int catId) {
+        Session session = getSession();
+        Query query = session.createQuery("From MatchSkilEntity where catId = :catId");
+        query.setParameter("catId", catId);
+        List<MatchSkilEntity> res = query.list();
+        session.close();;
+        return res;
+    }
+
+    public static List<ProjectStaffSkillEntity> getProjSkbyStaffId (int staffId) {
+        Session session = getSession();
+        Query query = session.createQuery("From ProjectStaffSkillEntity where slaveId = :slaveId");
+        query.setParameter("slaveId", staffId);
+        List<ProjectStaffSkillEntity> res = query.list();
+        session.close();
+        return res;
+    }
+
+    public static List<SkillCatEntity> getCategorySkill () {
+        Session session = getSession();
+        Query query = session.createQuery("From SkillCatEntity ");
+        List<SkillCatEntity> res = query.list();
+        session.close();
+        return res;
+    }
+}

DBModule/src/main/java/HibernateEntities/MatchSkilEntity.java

@@ -10,6 +10,18 @@ public class MatchSkilEntity {
     private Integer catId;
     private Integer skilId;
     private String matchId;
+    private String skillName;
+
+    @Basic
+    @Column(name = "skill_name", nullable = false)
+    public String getSkillName() {
+        return skillName;
+    }
+
+    public void setSkillName(String skillName) {
+        this.skillName = skillName;
+    }
+
     @Basic
     @Column(name = "skil_cat_id", nullable = false)
     public Integer getCatId() {
@@ -18,6 +30,7 @@ public class MatchSkilEntity {
     public void setCatId(Integer catId) {
         this.catId = catId;
     }
+
     @Basic
     @Column(name = "skil_id", nullable = false)
     public Integer getSkilId() {
@@ -26,6 +39,7 @@ public class MatchSkilEntity {
     public void setSkilId(Integer skilId) {
         this.skilId = skilId;
     }
+
     @Id
     @Column(name = "match_id", nullable = false)
     public String getMatchId() {

DBModule/src/main/java/HibernateEntities/ModeratorListSkills.java

@@ -0,0 +1,59 @@
+package HibernateEntities;
+
+import javax.persistence.*;
+
+/**
+ * Created by kinetik on 08.03.17.
+ */
+@Entity
+@Table(name = "mod_skill", schema = "anketa")
+public class ModeratorListSkills {
+    private String pairId;
+    private Integer skillId;
+    private Integer modId;
+    private Integer rating;
+
+    @Id
+    @Column(name = "mod_sk_id" , nullable = false)
+    public String getPairId() {
+        return pairId;
+    }
+
+    public void setPairId(String pairId) {
+        this.pairId = pairId;
+    }
+
+    public void setPairId() {
+        this.pairId = String.valueOf(this.modId) + "_" + String.valueOf(this.skillId);
+    }
+
+    @Basic
+    @Column(name = "skill_id", nullable = false)
+    public Integer getSkillId() {
+        return skillId;
+    }
+
+    public void setSkillId(Integer skillId) {
+        this.skillId = skillId;
+    }
+
+    @Basic
+    @Column(name = "mod_id", nullable = false)
+    public Integer getModId() {
+        return modId;
+    }
+
+    public void setModId(Integer modId) {
+        this.modId = modId;
+    }
+
+    @Basic
+    @Column(name = "rating", nullable = false)
+    public Integer getRating() {
+        return rating;
+    }
+
+    public void setRating(Integer rating) {
+        this.rating = rating;
+    }
+}

DBModule/src/main/java/HibernateEntities/ProjectStaffSkillEntity.java

@@ -6,11 +6,14 @@ import javax.persistence.*;
 @Entity
 @Table(name = "project_mod_skill", schema = "anketa")
 public class ProjectStaffSkillEntity {
+
     private Integer projId;
     private Integer skillId;
     private Integer slaveId;
     private Integer slRating;
     private String pmsId;
+    private String skillName;
+
     @Id
     @Column(name = "pms_id", nullable = false)
     public String getPmsId() {
@@ -22,6 +25,7 @@ public class ProjectStaffSkillEntity {
     public void setPmsId() {
         this.pmsId = String.valueOf(this.getProjId())+"_"+String.valueOf(this.getSkillId())+"_"+String.valueOf(this.getSlaveId());
     }
+
     @Basic
     @Column(name = "project_id", nullable = false)
     public Integer getProjId() {
@@ -30,6 +34,7 @@ public class ProjectStaffSkillEntity {
     public void setProjId(Integer projId) {
         this.projId = projId;
     }
+
     @Basic
     @Column(name = "skil_id", nullable = false)
     public Integer getSkillId() {
@@ -38,6 +43,7 @@ public class ProjectStaffSkillEntity {
     public void setSkillId(Integer skillId) {
         this.skillId = skillId;
     }
+
     @Basic
     @Column(name = "slave_id", nullable = false)
     public Integer getSlaveId() {
@@ -46,6 +52,17 @@ public class ProjectStaffSkillEntity {
     public void setSlaveId(Integer slaveId) {
         this.slaveId = slaveId;
     }
+
+    @Basic
+    @Column(name = "skill_name", nullable = false)
+    public String getSkillName() {
+        return skillName;
+    }
+
+    public void setSkillName(String skillName) {
+        this.skillName = skillName;
+    }
+
     @Basic
     @Column(name = "rating", nullable = false)
     public Integer getSlRating() {

DBModule/src/main/java/HibernateEntities/StudentListSkills.java

@@ -0,0 +1,59 @@
+package HibernateEntities;
+
+import javax.persistence.*;
+
+/**
+ * Created by kinetik on 08.03.17.
+ */
+@Entity
+@Table(name = "students_skill", schema = "anketa")
+public class StudentListSkills {
+    private String pairId;
+    private Integer studentId;
+    private Integer skillId;
+    private Integer rating;
+
+    @Id
+    @Column(name = "st_sk_id", nullable = false)
+    public String getPairId() {
+        return pairId;
+    }
+
+    public void setPairId(String pairId) {
+        this.pairId = pairId;
+    }
+
+    public void setPairId() {
+        this.pairId = String.valueOf(this.studentId) + "_" + String.valueOf(this.skillId);
+    }
+
+    @Basic
+    @Column(name = "stud_id", nullable = false)
+    public Integer getStudentId() {
+        return studentId;
+    }
+
+    public void setStudentId(Integer studentId) {
+        this.studentId = studentId;
+    }
+
+    @Basic
+    @Column(name = "skill_id", nullable = false)
+    public Integer getSkillId() {
+        return skillId;
+    }
+
+    public void setSkillId(Integer skillId) {
+        this.skillId = skillId;
+    }
+
+    @Basic
+    @Column(name = "rating", nullable = false)
+    public Integer getRating() {
+        return rating;
+    }
+
+    public void setRating(Integer rating) {
+        this.rating = rating;
+    }
+}

DBModule/src/main/resources/ModerListSkills.hbm.xml

@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+    <class name="HibernateEntities.ModeratorListSkills" table="mod_skill" schema="anketa">
+        <id name="pairId">
+            <column name="mod_sk_id" sql-type="varchar(10)" length="10" not-null="true"/>
+        </id>
+        <property name="skillId">
+            <column name="skill_id" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+        <property name="modId">
+            <column name="mod_id" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+        <property name="rating">
+            <column name="rating" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+    </class>
+</hibernate-mapping>

DBModule/src/main/resources/Project_mod_skillEntity.hbm.xml

@@ -10,6 +10,9 @@
         <property name="projId">
             <column name="project_id" sql-type="int(11)" length="11" not-null="true"/>
         </property>
+        <property name="skillName">
+            <column name="skill_name" sql-type="varchar(100)" length="100" not-null="true"/>
+        </property>
         <property name="skillId">
             <column name="skil_id" sql-type="int(11)" length="11" not-null="true"/>
         </property>

DBModule/src/main/resources/Skil_matchEntity.hbm.xml

@@ -7,6 +7,9 @@
         <id name="matchId">
             <column name="match_id" sql-type="varchar(45)" length="45" not-null="true"/>
         </id>
+        <property name="skillName">
+            <column name="skill_name" sql-type="varchar(100)" length="100" not-null="true"/>
+        </property>
         <property name="catId">
             <column name="skil_cat_id" sql-type="int(11)" length="11" not-null="true"/>
         </property>

DBModule/src/main/resources/StudentListSkills.hbm.xml

@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='utf-8'?>
+<!DOCTYPE hibernate-mapping PUBLIC
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
+<hibernate-mapping>
+    <class name="HibernateEntities.StudentListSkills" table="students_skill" schema="anketa">
+        <id name="pairId">
+            <column name="st_sk_id" sql-type="varchar(10)" length="10" not-null="true"/>
+        </id>
+        <property name="rating">
+            <column name="rating" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+        <property name="skillId">
+            <column name="skill_id" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+        <property name="studentId">
+            <column name="stud_id" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+    </class>
+</hibernate-mapping>

DBModule/src/main/resources/hibernate.cfg.xml

@@ -35,6 +35,10 @@
       <mapping class="HibernateEntities.SkillListEntity"/>
       <mapping class="HibernateEntities.MatchSkilEntity"/>
       <mapping resource="Skil_matchEntity.hbm.xml"/>
+      <mapping class="HibernateEntities.StudentListSkills"/>
+      <mapping resource="StudentListSkills.hbm.xml"/>
+      <mapping class="HibernateEntities.ModeratorListSkills"/>
+      <mapping resource="ModerListSkills.hbm.xml"/>
       <!-- <property name="connection.username"/> -->
     <!-- <property name="connection.password"/> -->