INITIAL DB MODEL

FairWindCo · Oct 8, 2015 · eb49fb6 · eb49fb6
1 parent 17797bc
commit eb49fb6
Show file tree

Hide file tree

Showing 29 changed files with 5,980 additions and 3 deletions.
diff --git a/.../artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war.xml b/.../artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war.xml
diff --git a/...Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war__exploded_.xml b/...Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war__exploded_.xml
diff --git a/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_0_1.xml b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_0_1.xml
diff --git a/.idea/libraries/Gradle__javax_servlet_jstl_1_2.xml b/.idea/libraries/Gradle__javax_servlet_jstl_1_2.xml
diff --git a/DocumentsDB.iml b/DocumentsDB.iml
@@ -107,5 +107,7 @@
     <orderEntry type="library" exported="" name="Gradle: com.lmax:disruptor:3.2.1" level="project" />
     <orderEntry type="library" exported="" name="Gradle: io.gatling:jsr166e:1.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.goldmansachs:gs-collections-api:5.1.0" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: javax.servlet:javax.servlet-api:3.0.1" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: javax.servlet:jstl:1.2" level="project" />
   </component>
 </module>
diff --git a/build.gradle b/build.gradle
@@ -16,6 +16,8 @@ repositories {
 
 dependencies {
     testCompile group: 'junit', name: 'junit', version: '4.11'
+    compile 'javax.servlet:javax.servlet-api'
+    compile 'javax.servlet:jstl'
     //SPIRNG основная + дополнения для ВЕБ
     compile 'org.springframework:spring-core'
     compile 'org.springframework:spring-webmvc'

diff --git a/src/main/java/ua/pp/fairwind/favorid/internalDB/controllers/ContactTypeController.java b/src/main/java/ua/pp/fairwind/favorid/internalDB/controllers/ContactTypeController.java
@@ -1,7 +1,6 @@
 package ua.pp.fairwind.favorid.internalDB.controllers;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpRequest;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
@@ -13,6 +12,8 @@
 import ua.pp.fairwind.favorid.internalDB.model.directories.ContactType;
 import ua.pp.fairwind.favorid.internalDB.repository.ContactTypeRepository;
 
+import javax.servlet.http.HttpServletRequest;
+
 
 /**
  * Created by Ñåðãåé on 07.10.2015.
@@ -32,7 +33,7 @@ public String list(Model model) {
     @Transactional(readOnly = true)
     @RequestMapping(value = "/listing", method = RequestMethod.POST)
     @ResponseBody
-    public JGridRowsResponse<ContactType> getTable(HttpRequest request){
+    public JGridRowsResponse<ContactType> getTable(HttpServletRequest request){
         return new JGridRowsResponse<ContactType>(repositoryContactType.findAll());
     }
 

diff --git a/src/main/webapp/jsp/contact_type_list.jsp b/src/main/webapp/jsp/contact_type_list.jsp
@@ -19,7 +19,7 @@
 <script type="text/javascript">
     $(document).ready(function () {
 
-        $("#jqGrid").jqGrid({
+        $("#jqGrid").jqxGrid({
             url: '${pageContext.request.contextPath}/contacttypes/listing',
             mtype: "POST",
             styleUI : 'Bootstrap',

diff --git a/src/main/webapp/resources/mydemo/jquery-1.11.1.min.js b/src/main/webapp/resources/mydemo/jquery-1.11.1.min.js