.idea/dataSources.xml

@@ -43,18 +43,6 @@
         <library>
           <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-java-5.1.35-bin.jar</url>
         </library>
-        <library>
-          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-license.txt</url>
-        </library>
-        <library>
-          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-java-5.1.35-bin.jar</url>
-        </library>
-        <library>
-          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-license.txt</url>
-        </library>
-        <library>
-          <url>file://$APPLICATION_CONFIG_DIR$/jdbc-drivers/MySQL Connector/J/5.1.35/mysql-connector-java-5.1.35-bin.jar</url>
-        </library>
       </libraries>
     </data-source>
   </component>

.idea/workspace.xml

@@ -2,10 +2,14 @@
 <project version="4">
   <component name="ChangeListManager">
     <list default="true" id="070a1094-550b-4f3a-bbc4-4306583dd144" name="Default" comment="First commit project">
+<<<<<<< HEAD
       <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/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$/AuthModule/src/main/java/Controller/StudentMovController.java" afterPath="$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java" />
+=======
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+>>>>>>> kinetikLocal
     </list>
     <ignored path="$PROJECT_DIR$/out/" />
     <ignored path="$PROJECT_DIR$/target/" />
@@ -37,8 +41,13 @@
       <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">
+<<<<<<< HEAD
             <state relative-caret-position="486">
               <caret line="27" column="53" lean-forward="true" selection-start-line="27" selection-start-column="53" selection-end-line="27" selection-end-column="53" />
+=======
+            <state relative-caret-position="648">
+              <caret line="36" column="51" lean-forward="false" selection-start-line="36" selection-start-column="51" selection-end-line="36" selection-end-column="51" />
+>>>>>>> kinetikLocal
               <folding />
             </state>
           </provider>
@@ -174,6 +183,12 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
+<<<<<<< HEAD
+=======
+      <pane id="Scratches" />
+      <pane id="Scope" />
+      <pane id="PackagesPane" />
+>>>>>>> kinetikLocal
       <pane id="ProjectPane">
         <subPane>
           <PATH>
@@ -250,9 +265,12 @@
           </PATH>
         </subPane>
       </pane>
+<<<<<<< HEAD
       <pane id="PackagesPane" />
       <pane id="Scratches" />
       <pane id="Scope" />
+=======
+>>>>>>> kinetikLocal
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -812,7 +830,11 @@
     <servers />
   </component>
   <component name="TimeTrackingManager">
+<<<<<<< HEAD
     <option name="totallyTimeSpent" value="83517000" />
+=======
+    <option name="totallyTimeSpent" value="74633000" />
+>>>>>>> kinetikLocal
   </component>
   <component name="ToolWindowManager">
     <frame x="65" y="24" width="1855" height="1056" extended-state="6" />
@@ -1089,52 +1111,6 @@
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="360">
           <caret line="20" column="33" lean-forward="false" selection-start-line="20" selection-start-column="33" selection-end-line="20" selection-end-column="33" />
-          <folding>
-            <element signature="e#684#685#0" expanded="false" />
-            <element signature="e#716#717#0" expanded="false" />
-            <element signature="e#767#768#0" expanded="false" />
-            <element signature="e#809#810#0" expanded="false" />
-            <element signature="e#906#907#0" expanded="false" />
-            <element signature="e#940#941#0" expanded="false" />
-            <element signature="e#994#995#0" expanded="false" />
-            <element signature="e#1040#1041#0" expanded="false" />
-            <element signature="e#1137#1138#0" expanded="false" />
-            <element signature="e#1167#1168#0" expanded="false" />
-            <element signature="e#1213#1214#0" expanded="false" />
-            <element signature="e#1251#1252#0" expanded="false" />
-            <element signature="e#1347#1348#0" expanded="false" />
-            <element signature="e#1380#1381#0" expanded="false" />
-            <element signature="e#1432#1433#0" expanded="false" />
-            <element signature="e#1476#1477#0" expanded="false" />
-            <element signature="e#1567#1568#0" expanded="false" />
-            <element signature="e#1597#1598#0" expanded="false" />
-            <element signature="e#1643#1644#0" expanded="false" />
-            <element signature="e#1681#1682#0" expanded="false" />
-            <element signature="e#1758#1759#0" expanded="false" />
-            <element signature="e#1788#1789#0" expanded="false" />
-            <element signature="e#1835#1836#0" expanded="false" />
-            <element signature="e#1873#1874#0" expanded="false" />
-            <element signature="e#1966#1967#0" expanded="false" />
-            <element signature="e#1999#2000#0" expanded="false" />
-            <element signature="e#2048#2049#0" expanded="false" />
-            <element signature="e#2092#2093#0" expanded="false" />
-            <element signature="e#2200#2201#0" expanded="false" />
-            <element signature="e#2231#2232#0" expanded="false" />
-            <element signature="e#2279#2280#0" expanded="false" />
-            <element signature="e#2319#2320#0" expanded="false" />
-            <element signature="e#2434#2435#0" expanded="false" />
-            <element signature="e#2468#2469#0" expanded="false" />
-            <element signature="e#2522#2523#0" expanded="false" />
-            <element signature="e#2568#2569#0" expanded="false" />
-            <element signature="e#2679#2680#0" expanded="false" />
-            <element signature="e#2711#2712#0" expanded="false" />
-            <element signature="e#2761#2762#0" expanded="false" />
-            <element signature="e#2803#2804#0" expanded="false" />
-            <element signature="e#2916#2917#0" expanded="false" />
-            <element signature="e#2949#2950#0" expanded="false" />
-            <element signature="e#3001#3002#0" expanded="false" />
-            <element signature="e#3045#3046#0" expanded="false" />
-          </folding>
         </state>
       </provider>
     </entry>
@@ -1161,6 +1137,7 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/AuthModule/src/main/java/Controller/StudentMovController.java">
       <provider selected="true" editor-type-id="text-editor">
+<<<<<<< HEAD
         <state relative-caret-position="36">
           <caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="0" />
         </state>
@@ -1283,6 +1260,10 @@
         <state relative-caret-position="252">
           <caret line="14" column="64" lean-forward="false" selection-start-line="14" selection-start-column="64" selection-end-line="14" selection-end-column="64" />
           <folding />
+=======
+        <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" />
+>>>>>>> kinetikLocal
         </state>
       </provider>
     </entry>

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

@@ -0,0 +1,47 @@
+package HibernateEntities;
+
+import javax.persistence.*;
+
+/**
+ * Created by kinetik on 07.03.17.
+ */
+@Entity
+@Table(name = "skil_match", schema = "anketa")
+public class MatchSkilEntity {
+    private Integer catId;
+    private Integer skilId;
+    private String matchId;
+
+    @Basic
+    @Column(name = "skil_cat_id", nullable = false)
+    public Integer getCatId() {
+        return catId;
+    }
+
+    public void setCatId(Integer catId) {
+        this.catId = catId;
+    }
+
+    @Basic
+    @Column(name = "skil_id", nullable = false)
+    public Integer getSkilId() {
+        return skilId;
+    }
+
+    public void setSkilId(Integer skilId) {
+        this.skilId = skilId;
+    }
+
+    @Id
+    @Column(name = "match_id", nullable = false)
+    public String getMatchId() {
+        return matchId;
+    }
+
+    public void setMatchId(){
+        this.matchId = String.valueOf(this.getSkilId())+"_"+String.valueOf(this.getCatId());
+    }
+    public void setMatchId(String matchId) {
+        this.matchId = matchId;
+    }
+}

DBModule/src/main/java/HibernateEntities/ProjectSkillCatEntity.java

@@ -0,0 +1,47 @@
+package HibernateEntities;
+
+import javax.persistence.*;
+
+/**
+ * Created by kinetik on 07.03.17.
+ */
+@Entity
+@Table(name = "project_skil_cat", schema = "anketa")
+public class ProjectSkillCatEntity {
+    private Integer prId;
+    private Integer skilCatId;
+    private String pcsId;
+    @Id
+    @Column(name = "pcs_id", nullable = false)
+    public String getPcsId() {
+        return pcsId;
+    }
+
+    public void setPcsId(String pcsId) {
+        this.pcsId = pcsId;
+    }
+
+    public void setPcsId(){
+        this.pcsId = String.valueOf(this.getPrId())+" "+String.valueOf(this.getSkilCatId());
+    }
+
+    @Basic
+    @Column(name = "project_id", nullable = false)
+    public Integer getPrId() {
+        return prId;
+    }
+
+    public void setPrId(Integer prId) {
+        this.prId = prId;
+    }
+
+    @Basic
+    @Column(name = "skil_cat_id", nullable = false)
+    public Integer getSkilCatId() {
+        return skilCatId;
+    }
+
+    public void setSkilCatId(Integer skilCatId) {
+        this.skilCatId = skilCatId;
+    }
+}

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

@@ -0,0 +1,68 @@
+package HibernateEntities;
+
+import javax.persistence.*;
+
+/**
+ * Created by kinetik on 07.03.17.
+ */
+@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;
+
+    @Id
+    @Column(name = "pms_id", nullable = false)
+    public String getPmsId() {
+        return pmsId;
+    }
+    public void setPmsId(String pmsId) {
+        this.pmsId = pmsId;
+    }
+    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() {
+        return projId;
+    }
+
+    public void setProjId(Integer projId) {
+        this.projId = projId;
+    }
+
+    @Basic
+    @Column(name = "skil_id", nullable = false)
+    public Integer getSkillId() {
+        return skillId;
+    }
+
+    public void setSkillId(Integer skillId) {
+        this.skillId = skillId;
+    }
+
+    @Basic
+    @Column(name = "slave_id", nullable = false)
+    public Integer getSlaveId() {
+        return slaveId;
+    }
+
+    public void setSlaveId(Integer slaveId) {
+        this.slaveId = slaveId;
+    }
+
+    @Basic
+    @Column(name = "rating", nullable = false)
+    public Integer getSlRating() {
+        return slRating;
+    }
+
+    public void setSlRating(Integer slRating) {
+        this.slRating = slRating;
+    }
+}

DBModule/src/main/java/HibernateEntities/SkillCatEntity.java

@@ -0,0 +1,33 @@
+package HibernateEntities;
+
+import javax.persistence.*;
+
+/**
+ * Created by kinetik on 07.03.17.
+ */
+@Entity
+@Table(name = "skil_cat", schema = "anketa")
+public class SkillCatEntity {
+    private Integer catId;
+    private String catName;
+
+    @Id
+    @Column(name = "skil_cat_id", nullable = false)
+    public Integer getCatId() {
+        return catId;
+    }
+
+    public void setCatId(Integer catId) {
+        this.catId = catId;
+    }
+
+    @Basic
+    @Column(name = "skil_cat_name", nullable = false)
+    public String getCatName() {
+        return catName;
+    }
+
+    public void setCatName(String catName) {
+        this.catName = catName;
+    }
+}

DBModule/src/main/java/HibernateEntities/SkillListEntity.java

@@ -0,0 +1,33 @@
+package HibernateEntities;
+
+import javax.persistence.*;
+
+/**
+ * Created by kinetik on 07.03.17.
+ */
+@Entity
+@Table(name = "skil_list", schema = "anketa")
+public class SkillListEntity {
+    private Integer skilId;
+    private String skilName;
+
+    @Id
+    @Column(name = "skil_id", nullable = false)
+    public Integer getSkilId() {
+        return skilId;
+    }
+
+    public void setSkilId(Integer skilId) {
+        this.skilId = skilId;
+    }
+
+    @Basic
+    @Column(name = "skil_name", nullable = false)
+    public String getSkilName() {
+        return skilName;
+    }
+
+    public void setSkilName(String skilName) {
+        this.skilName = skilName;
+    }
+}

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

@@ -0,0 +1,24 @@
+<?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.ProjectStaffSkillEntity" table="project_mod_skill" schema="anketa">
+        <id name="pmsId">
+            <column name="pms_id" sql-type="varchar(45)" length="45"not-null="true"/>
+        </id>
+        <property name="projId">
+            <column name="project_id" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+        <property name="skillId">
+            <column name="skil_id" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+        <property name="slaveId">
+            <column name="slave_id" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+        <property name="slRating">
+            <column name="rating" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+    </class>
+</hibernate-mapping>

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

@@ -0,0 +1,18 @@
+<?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.ProjectSkillCatEntity" table="project_skil_cat" schema="anketa">
+        <id name="pcsId">
+            <column name="pcs_id" sql-type="varchar(45)" length="45" not-null="true"/>
+        </id>
+        <property name="prId">
+            <column name="project_id" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+        <property name="skilCatId">
+            <column name="skil_cat_id" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+    </class>
+</hibernate-mapping>

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

@@ -0,0 +1,15 @@
+<?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.SkillCatEntity" table="skil_cat" schema="anketa">
+        <id name="catId">
+            <column name="skil_cat_id" sql-type="int(11)" length="11" not-null="true"/>
+        </id>
+        <property name="catName">
+            <column name="skil_cat_name" sql-type="varchar(100)" length="100" not-null="true"/>
+        </property>
+    </class>
+</hibernate-mapping>

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

@@ -0,0 +1,15 @@
+<?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.SkillListEntity" table="skil_list" schema="anketa">
+        <id name="skilId">
+            <column name="skil_id" sql-type="int(11)" length="11" not-null="true"/>
+        </id>
+        <property name="skilName">
+            <column name="skil_name" sql-type="varchar(100)" length="100" not-null="true"/>
+        </property>
+    </class>
+</hibernate-mapping>

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

@@ -0,0 +1,18 @@
+<?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.MatchSkilEntity" table="skil_match" schema="anketa">
+        <id name="matchId">
+            <column name="match_id" sql-type="varchar(45)" length="45" not-null="true"/>
+        </id>
+        <property name="catId">
+            <column name="skil_cat_id" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+        <property name="skilId">
+            <column name="skil_id" sql-type="int(11)" length="11" not-null="true"/>
+        </property>
+    </class>
+</hibernate-mapping>

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

@@ -25,6 +25,14 @@
       <mapping class="HibernateEntities.StudentsEntity"/>
       <mapping resource="UsersEntity.hbm.xml"/>
       <mapping class="HibernateEntities.UsersEntity"/>
+      <mapping resource="Project_mod_skillEntity.hbm.xml"/>
+      <mapping class="HibernateEntities.ProjectStaffSkillEntity"/>
+      <mapping resource="Project_skil_catEntity.hbm.xml"/>
+      <mapping class="HibernateEntities.ProjectSkillCatEntity"/>
+      <mapping resource="Skil_catEntity.hbm.xml"/>
+      <mapping class="HibernateEntities.SkillCatEntity"/>
+      <mapping resource="Skil_listEntity.hbm.xml"/>
+      <mapping class="HibernateEntities.SkillListEntity"/>
       <!-- <property name="connection.username"/> -->
     <!-- <property name="connection.password"/> -->