From ffda3997d5cdc396ca888ed987071c277ba22df9 Mon Sep 17 00:00:00 2001 From: Rodrigo Quelca Date: Fri, 4 Dec 2020 20:36:42 +0000 Subject: [PATCH] fix conflicts fix Revert "fix" This reverts commit 6d21e322081ecd8b89db4d6c07c6c8a82b2549a6. add advanced-search main fix header gif Home fix missed code CR notes CR notes 2 CR notes 5 CR notes 8 --- resources/assets/js/api/Cases.js | 9 + .../js/components/search/GenericFilter.vue | 343 +++++++++++++++ .../js/components/search/SearchDataTable.vue | 83 ++++ .../components/search/popovers/CaseNumber.vue | 77 ++++ .../search/popovers/CasePriority.vue | 64 +++ .../components/search/popovers/CaseStatus.vue | 64 +++ .../components/search/popovers/CaseTitle.vue | 62 +++ .../components/search/popovers/Category.vue | 51 +++ .../js/components/search/popovers/DueDate.vue | 78 ++++ .../search/popovers/ParticipatedLevel.vue | 73 ++++ .../search/popovers/ProcessName.vue | 86 ++++ .../search/popovers/SearchPopover.vue | 59 +++ .../js/components/search/popovers/SentBy.vue | 70 +++ resources/assets/js/components/utils/Fail.vue | 3 + .../assets/js/components/utils/Loading.vue | 22 + resources/assets/js/home/AdvancedSearch.vue | 408 ++++++++++++++++++ resources/assets/js/home/Home.vue | 6 +- resources/assets/js/mocks/menu.json | 1 + 18 files changed, 1557 insertions(+), 2 deletions(-) create mode 100644 resources/assets/js/components/search/GenericFilter.vue create mode 100644 resources/assets/js/components/search/SearchDataTable.vue create mode 100644 resources/assets/js/components/search/popovers/CaseNumber.vue create mode 100644 resources/assets/js/components/search/popovers/CasePriority.vue create mode 100644 resources/assets/js/components/search/popovers/CaseStatus.vue create mode 100644 resources/assets/js/components/search/popovers/CaseTitle.vue create mode 100644 resources/assets/js/components/search/popovers/Category.vue create mode 100644 resources/assets/js/components/search/popovers/DueDate.vue create mode 100644 resources/assets/js/components/search/popovers/ParticipatedLevel.vue create mode 100644 resources/assets/js/components/search/popovers/ProcessName.vue create mode 100644 resources/assets/js/components/search/popovers/SearchPopover.vue create mode 100644 resources/assets/js/components/search/popovers/SentBy.vue create mode 100644 resources/assets/js/components/utils/Fail.vue create mode 100644 resources/assets/js/components/utils/Loading.vue create mode 100644 resources/assets/js/home/AdvancedSearch.vue diff --git a/resources/assets/js/api/Cases.js b/resources/assets/js/api/Cases.js index 63b985ed2..379d50968 100644 --- a/resources/assets/js/api/Cases.js +++ b/resources/assets/js/api/Cases.js @@ -1,5 +1,6 @@ import axios from "axios"; import headerData from "./../mocks/casesHeader.json"; +import startedCasesFaker from "./../mocks/startedCasesFaker.js"; import Api from "./Api.js"; export let cases = { @@ -32,6 +33,14 @@ export let cases = { return axios.post(window.config.SYS_SERVER + window.config.SYS_URI + `cases/casesStartPage_Ajax.php`, params); + }, + //remove this section + search(data) { + return new Promise((resolutionFunc, rejectionFunc) => { + + resolutionFunc(startedCasesFaker); + + }); } }; diff --git a/resources/assets/js/components/search/GenericFilter.vue b/resources/assets/js/components/search/GenericFilter.vue new file mode 100644 index 000000000..1e3fce8d1 --- /dev/null +++ b/resources/assets/js/components/search/GenericFilter.vue @@ -0,0 +1,343 @@ + + + + \ No newline at end of file diff --git a/resources/assets/js/components/search/SearchDataTable.vue b/resources/assets/js/components/search/SearchDataTable.vue new file mode 100644 index 000000000..049b5bee8 --- /dev/null +++ b/resources/assets/js/components/search/SearchDataTable.vue @@ -0,0 +1,83 @@ + + + diff --git a/resources/assets/js/components/search/popovers/CaseNumber.vue b/resources/assets/js/components/search/popovers/CaseNumber.vue new file mode 100644 index 000000000..82960262d --- /dev/null +++ b/resources/assets/js/components/search/popovers/CaseNumber.vue @@ -0,0 +1,77 @@ + + + + diff --git a/resources/assets/js/components/search/popovers/CasePriority.vue b/resources/assets/js/components/search/popovers/CasePriority.vue new file mode 100644 index 000000000..69e68b7a8 --- /dev/null +++ b/resources/assets/js/components/search/popovers/CasePriority.vue @@ -0,0 +1,64 @@ + +| + + diff --git a/resources/assets/js/components/search/popovers/CaseStatus.vue b/resources/assets/js/components/search/popovers/CaseStatus.vue new file mode 100644 index 000000000..d50ee3b5b --- /dev/null +++ b/resources/assets/js/components/search/popovers/CaseStatus.vue @@ -0,0 +1,64 @@ + +| + + diff --git a/resources/assets/js/components/search/popovers/CaseTitle.vue b/resources/assets/js/components/search/popovers/CaseTitle.vue new file mode 100644 index 000000000..68da628be --- /dev/null +++ b/resources/assets/js/components/search/popovers/CaseTitle.vue @@ -0,0 +1,62 @@ + +| + + diff --git a/resources/assets/js/components/search/popovers/Category.vue b/resources/assets/js/components/search/popovers/Category.vue new file mode 100644 index 000000000..259dfb582 --- /dev/null +++ b/resources/assets/js/components/search/popovers/Category.vue @@ -0,0 +1,51 @@ + + + + diff --git a/resources/assets/js/components/search/popovers/DueDate.vue b/resources/assets/js/components/search/popovers/DueDate.vue new file mode 100644 index 000000000..1ee28a7f1 --- /dev/null +++ b/resources/assets/js/components/search/popovers/DueDate.vue @@ -0,0 +1,78 @@ + + + + \ No newline at end of file diff --git a/resources/assets/js/components/search/popovers/ParticipatedLevel.vue b/resources/assets/js/components/search/popovers/ParticipatedLevel.vue new file mode 100644 index 000000000..c72e5f606 --- /dev/null +++ b/resources/assets/js/components/search/popovers/ParticipatedLevel.vue @@ -0,0 +1,73 @@ + +| + + diff --git a/resources/assets/js/components/search/popovers/ProcessName.vue b/resources/assets/js/components/search/popovers/ProcessName.vue new file mode 100644 index 000000000..fb5ab9b90 --- /dev/null +++ b/resources/assets/js/components/search/popovers/ProcessName.vue @@ -0,0 +1,86 @@ + + + + diff --git a/resources/assets/js/components/search/popovers/SearchPopover.vue b/resources/assets/js/components/search/popovers/SearchPopover.vue new file mode 100644 index 000000000..f3f173ebe --- /dev/null +++ b/resources/assets/js/components/search/popovers/SearchPopover.vue @@ -0,0 +1,59 @@ + + + + \ No newline at end of file diff --git a/resources/assets/js/components/search/popovers/SentBy.vue b/resources/assets/js/components/search/popovers/SentBy.vue new file mode 100644 index 000000000..02c369699 --- /dev/null +++ b/resources/assets/js/components/search/popovers/SentBy.vue @@ -0,0 +1,70 @@ + +| + + \ No newline at end of file diff --git a/resources/assets/js/components/utils/Fail.vue b/resources/assets/js/components/utils/Fail.vue new file mode 100644 index 000000000..0963b8473 --- /dev/null +++ b/resources/assets/js/components/utils/Fail.vue @@ -0,0 +1,3 @@ + \ No newline at end of file diff --git a/resources/assets/js/components/utils/Loading.vue b/resources/assets/js/components/utils/Loading.vue new file mode 100644 index 000000000..477bc70eb --- /dev/null +++ b/resources/assets/js/components/utils/Loading.vue @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/resources/assets/js/home/AdvancedSearch.vue b/resources/assets/js/home/AdvancedSearch.vue new file mode 100644 index 000000000..f9195e6e1 --- /dev/null +++ b/resources/assets/js/home/AdvancedSearch.vue @@ -0,0 +1,408 @@ + + + diff --git a/resources/assets/js/home/Home.vue b/resources/assets/js/home/Home.vue index 62691ef5e..75680f173 100644 --- a/resources/assets/js/home/Home.vue +++ b/resources/assets/js/home/Home.vue @@ -26,12 +26,14 @@ import MyDocuments from "./MyDocuments"; import BatchRouting from "./BatchRouting"; import XCase from "./XCase"; import TaskReassignments from "./TaskReassignments"; +import AdvancedSearch from "./AdvancedSearch" export default { name: "Home", components: { CustomSidebar, MyCases, + AdvancedSearch, MyDocuments, BatchRouting, TaskReassignments, @@ -78,10 +80,10 @@ export default { /** * Toggle sidebar handler * @param {Boolean} collapsed - if sidebar is collapsed true|false - * + * */ onToggleCollapse(collapsed) { - this.collapsed = collapsed; + this.collapsed = collapsed; }, }, }; diff --git a/resources/assets/js/mocks/menu.json b/resources/assets/js/mocks/menu.json index ee562a553..09d7651b5 100644 --- a/resources/assets/js/mocks/menu.json +++ b/resources/assets/js/mocks/menu.json @@ -11,6 +11,7 @@ }, { "href": "/advanced-search", + "id": "advanced-search", "title": "Advanced Search", "icon": "fas fa-search" },