From eb49fb652a435fe0b57e748fe700908d41844268 Mon Sep 17 00:00:00 2001 From: FairWindCo Date: Thu, 8 Oct 2015 14:57:28 +0300 Subject: [PATCH] INITIAL DB MODEL --- ...mentsDB___DocumentsDB_1_0_SNAPSHOT_war.xml | 2 + ...ocumentsDB_1_0_SNAPSHOT_war__exploded_.xml | 2 + ..._javax_servlet_javax_servlet_api_3_0_1.xml | 9 + .../Gradle__javax_servlet_jstl_1_2.xml | 11 + DocumentsDB.iml | 2 + build.gradle | 2 + .../controllers/ContactTypeController.java | 5 +- src/main/webapp/jsp/contact_type_list.jsp | 2 +- .../resources/mydemo/jquery-1.11.1.min.js | 4 + src/main/webapp/resources/mydemo/jqx.base.css | 5719 +++++++++++++++++ .../webapp/resources/mydemo/jqxbuttons.js | 7 + .../webapp/resources/mydemo/jqxcombobox.js | 7 + src/main/webapp/resources/mydemo/jqxcore.js | 7 + src/main/webapp/resources/mydemo/jqxdata.js | 7 + .../resources/mydemo/jqxgrid.aggregates.js | 7 + .../resources/mydemo/jqxgrid.columnsresize.js | 7 + .../webapp/resources/mydemo/jqxgrid.edit.js | 7 + .../webapp/resources/mydemo/jqxgrid.filter.js | 7 + .../resources/mydemo/jqxgrid.grouping.js | 7 + src/main/webapp/resources/mydemo/jqxgrid.js | 7 + .../webapp/resources/mydemo/jqxgrid.pager.js | 7 + .../resources/mydemo/jqxgrid.selection.js | 7 + .../webapp/resources/mydemo/jqxgrid.sort.js | 7 + .../resources/mydemo/jqxgrid.storage.js | 7 + src/main/webapp/resources/mydemo/jqxmenu.js | 7 + .../webapp/resources/mydemo/jqxscrollbar.js | 7 + .../webapp/resources/mydemo/jqxscrollview.js | 7 + src/main/webapp/resources/mydemo/printing.htm | 44 + src/main/webapp/resources/mydemo/test.html | 62 + 29 files changed, 5980 insertions(+), 3 deletions(-) create mode 100644 .idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_0_1.xml create mode 100644 .idea/libraries/Gradle__javax_servlet_jstl_1_2.xml create mode 100644 src/main/webapp/resources/mydemo/jquery-1.11.1.min.js create mode 100644 src/main/webapp/resources/mydemo/jqx.base.css create mode 100644 src/main/webapp/resources/mydemo/jqxbuttons.js create mode 100644 src/main/webapp/resources/mydemo/jqxcombobox.js create mode 100644 src/main/webapp/resources/mydemo/jqxcore.js create mode 100644 src/main/webapp/resources/mydemo/jqxdata.js create mode 100644 src/main/webapp/resources/mydemo/jqxgrid.aggregates.js create mode 100644 src/main/webapp/resources/mydemo/jqxgrid.columnsresize.js create mode 100644 src/main/webapp/resources/mydemo/jqxgrid.edit.js create mode 100644 src/main/webapp/resources/mydemo/jqxgrid.filter.js create mode 100644 src/main/webapp/resources/mydemo/jqxgrid.grouping.js create mode 100644 src/main/webapp/resources/mydemo/jqxgrid.js create mode 100644 src/main/webapp/resources/mydemo/jqxgrid.pager.js create mode 100644 src/main/webapp/resources/mydemo/jqxgrid.selection.js create mode 100644 src/main/webapp/resources/mydemo/jqxgrid.sort.js create mode 100644 src/main/webapp/resources/mydemo/jqxgrid.storage.js create mode 100644 src/main/webapp/resources/mydemo/jqxmenu.js create mode 100644 src/main/webapp/resources/mydemo/jqxscrollbar.js create mode 100644 src/main/webapp/resources/mydemo/jqxscrollview.js create mode 100644 src/main/webapp/resources/mydemo/printing.htm create mode 100644 src/main/webapp/resources/mydemo/test.html diff --git a/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war.xml b/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war.xml index 4fac5cc..0025fe9 100644 --- a/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war.xml +++ b/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war.xml @@ -71,6 +71,8 @@ + + diff --git a/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war__exploded_.xml b/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war__exploded_.xml index 0b8672a..00bced0 100644 --- a/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war__exploded_.xml +++ b/.idea/artifacts/Gradle___ua_pp_fairwind_favorit_DocumentsDB___DocumentsDB_1_0_SNAPSHOT_war__exploded_.xml @@ -71,6 +71,8 @@ + + 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 new file mode 100644 index 0000000..c2b82bb --- /dev/null +++ b/.idea/libraries/Gradle__javax_servlet_javax_servlet_api_3_0_1.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__javax_servlet_jstl_1_2.xml b/.idea/libraries/Gradle__javax_servlet_jstl_1_2.xml new file mode 100644 index 0000000..c3ead10 --- /dev/null +++ b/.idea/libraries/Gradle__javax_servlet_jstl_1_2.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/DocumentsDB.iml b/DocumentsDB.iml index ce6526d..3acd209 100644 --- a/DocumentsDB.iml +++ b/DocumentsDB.iml @@ -107,5 +107,7 @@ + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 33ba421..cc3f305 100644 --- 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 index 1501206..8f3c5a3 100644 --- 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 getTable(HttpRequest request){ + public JGridRowsResponse getTable(HttpServletRequest request){ return new JGridRowsResponse(repositoryContactType.findAll()); } diff --git a/src/main/webapp/jsp/contact_type_list.jsp b/src/main/webapp/jsp/contact_type_list.jsp index cd00321..acf5cc9 100644 --- a/src/main/webapp/jsp/contact_type_list.jsp +++ b/src/main/webapp/jsp/contact_type_list.jsp @@ -19,7 +19,7 @@ + + + + + + + + + + + + + +
+
+
+
+ + diff --git a/src/main/webapp/resources/mydemo/test.html b/src/main/webapp/resources/mydemo/test.html new file mode 100644 index 0000000..cb41f7b --- /dev/null +++ b/src/main/webapp/resources/mydemo/test.html @@ -0,0 +1,62 @@ + + + + The following example shows how to get the Grid's HTML, add it to a new browser window and trigger printing. + + + + + + + + + + + + + + + + + +
+ TEST +
+
+
+
+
+
+ +