INITIAL DB MODEL

FairWindCo · Oct 12, 2015 · 49af4aa · 49af4aa
1 parent 3a86095
commit 49af4aa
Show file tree

Hide file tree

Showing 30 changed files with 1,120 additions and 252 deletions.
diff --git a/.idea/artifacts/DocumentsDB_war_exploded.xml b/.idea/artifacts/DocumentsDB_war_exploded.xml
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/.idea/libraries/Gradle__com_goldmansachs_gs_collections_5_1_0.xml b/.idea/libraries/Gradle__com_goldmansachs_gs_collections_5_1_0.xml
diff --git a/.idea/libraries/Gradle__io_gatling_jsr166e_1_0.xml b/.idea/libraries/Gradle__io_gatling_jsr166e_1_0.xml
diff --git a/.idea/libraries/Gradle__org_eclipse_persistence_javax_persistence_2_1_0.xml b/.idea/libraries/Gradle__org_eclipse_persistence_javax_persistence_2_1_0.xml
diff --git a/.idea/libraries/Gradle__org_projectreactor_reactor_core_1_1_6_RELEASE.xml b/.idea/libraries/Gradle__org_projectreactor_reactor_core_1_1_6_RELEASE.xml
diff --git a/.idea/libraries/Gradle__org_springframework_retry_spring_retry_1_1_2_RELEASE.xml b/.idea/libraries/Gradle__org_springframework_retry_spring_retry_1_1_2_RELEASE.xml
diff --git a/.idea/libraries/Gradle__org_springframework_spring_messaging_4_1_7_RELEASE.xml b/.idea/libraries/Gradle__org_springframework_spring_messaging_4_1_7_RELEASE.xml
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,9 @@ version '1.0-SNAPSHOT'
 
 apply plugin: 'java'
 apply plugin: 'war'
+//apply plugin: 'idea'
 apply plugin: 'io.spring.dependency-management'
+//apply plugin: 'org.akhikhl.gretty'
 
 sourceCompatibility = JavaVersion.VERSION_1_8
 targetCompatibility = JavaVersion.VERSION_1_8
@@ -54,8 +56,16 @@ buildscript {
     }
     dependencies {
         classpath 'io.spring.gradle:dependency-management-plugin:0.5.1.RELEASE'
+        //classpath 'org.akhikhl.gretty:gretty:+'
     }
 }
+/*
+gretty {
+    port = 8080
+    contextPath = 'spring4'
+    servletContainer = 'jetty9' //tomcat7 or tomcat8
+}
+/**/
 
 dependencyManagement {
     imports {

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
@@ -53,7 +53,7 @@ public JGridRowsResponse<ContactType> getTable(HttpServletRequest request){
             try {
                 page = Integer.parseInt(request.getParameter("page")) - 1;
                 rows = request.getParameter("rows") == null ? 10 : Integer.parseInt(request.getParameter("rows"));
-                if(request.getParameter("sidx")!=null){
+                if(request.getParameter("sidx")!=null && !request.getParameter("sidx").isEmpty()){
                     String direction=request.getParameter("sord");
                     pageRequest=new PageRequest(page,rows,"asc".equals(direction)? Sort.Direction.ASC: Sort.Direction.DESC,request.getParameter("sidx"));
                 } else {