Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
R
reybex-educational-app
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
M. Esat Akpunar
reybex-educational-app
Commits
b0ccde72
Commit
b0ccde72
authored
Sep 01, 2022
by
esatakpunar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
pagination `pageNumber` bug fixed
parent
f0bc5a80
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
59 additions
and
20 deletions
+59
-20
index.vue
client/src/modules/customers/index.vue
+21
-10
actions.js
client/src/modules/customers/store/actions.js
+20
-9
getters.js
client/src/modules/customers/store/getters.js
+6
-0
mutations.js
client/src/modules/customers/store/mutations.js
+9
-0
state.js
client/src/modules/customers/store/state.js
+2
-0
index.vue
client/src/modules/products/index.vue
+1
-1
No files found.
client/src/modules/customers/index.vue
View file @
b0ccde72
...
@@ -21,10 +21,12 @@ export default {
...
@@ -21,10 +21,12 @@ export default {
"editedIndex"
,
"editedIndex"
,
"getOptions"
,
"getOptions"
,
"totalCustomers"
,
"totalCustomers"
,
"getSearch"
,
"getColumn"
,
]),
]),
indexofColumn
()
{
indexofColumn
()
{
return
this
.
dialogHeaders
.
findIndex
(
return
this
.
dialogHeaders
.
findIndex
(
(
header
)
=>
this
.
c
olumn
==
header
.
value
(
header
)
=>
this
.
getC
olumn
==
header
.
value
);
);
},
},
...
@@ -46,10 +48,13 @@ export default {
...
@@ -46,10 +48,13 @@ export default {
"saveCustomer"
,
"saveCustomer"
,
"editCustomer"
,
"editCustomer"
,
"setOptions"
,
"setOptions"
,
"setSearch"
,
"setColumn"
,
"searchData"
,
]),
]),
},
},
created
()
{
created
()
{
this
.
fetchCustomerData
({
searchInput
:
""
,
filterColumn
:
"id"
});
this
.
fetchCustomerData
({});
},
},
};
};
</
script
>
</
script
>
...
@@ -97,7 +102,10 @@ export default {
...
@@ -97,7 +102,10 @@ export default {
color=
"blue"
color=
"blue"
class=
"white--text"
class=
"white--text"
@
click=
"
@
click=
"
fetchCustomerData(
{ searchInput: search, filterColumn: column })
fetchCustomerData(
{
searchInput: getSearch,
filterColumn: getColumn,
})
"
"
>
>
<v-icon>
refresh
</v-icon>
<v-icon>
refresh
</v-icon>
...
@@ -141,7 +149,15 @@ export default {
...
@@ -141,7 +149,15 @@ export default {
<v-btn
color=
"blue darken-1"
@
click=
"closeDialog()"
<v-btn
color=
"blue darken-1"
@
click=
"closeDialog()"
>
Cancel
</v-btn
>
Cancel
</v-btn
>
>
<v-btn
color=
"blue darken-1"
@
click=
"saveCustomer()"
>
<v-btn
color=
"blue darken-1"
@
click=
"
saveCustomer(
{
searchInput: getSearch,
filterColumn: getColumn,
})
"
>
Save
</v-btn
Save
</v-btn
>
>
</
template
>
</
template
>
...
@@ -170,12 +186,7 @@ export default {
...
@@ -170,12 +186,7 @@ export default {
class=
"ml-4"
class=
"ml-4"
></v-text-field>
></v-text-field>
<v-btn
<v-btn
@
click=
"
@
click=
"searchData({ data: search, column: column })"
fetchCustomerData({
searchInput: search,
filterColumn: column,
})
"
class=
"ml-4"
class=
"ml-4"
large
large
>
Search
>
Search
...
...
client/src/modules/customers/store/actions.js
View file @
b0ccde72
import
axios
from
"axios"
;
import
axios
from
"axios"
;
export
default
{
export
default
{
fetchCustomerData
({
commit
,
getters
}
,
data
=
{}
)
{
fetchCustomerData
({
commit
,
getters
})
{
let
query
;
let
query
;
if
(
data
.
filter
Column
==
"all"
)
{
if
(
getters
.
get
Column
==
"all"
)
{
query
=
"q="
+
data
.
searchInput
;
query
=
"q="
+
getters
.
getSearch
;
}
else
if
(
data
.
filter
Column
)
{
}
else
if
(
getters
.
get
Column
)
{
query
=
data
.
filterColumn
+
"_like="
+
data
.
searchInput
;
query
=
getters
.
getColumn
+
"_like="
+
getters
.
getSearch
;
}
}
let
pageLimit
=
`&_page=
${
getters
.
getOptions
.
page
}
&_limit=
${
getters
.
getOptions
.
itemsPerPage
}
`
;
let
pageLimit
=
`&_page=
${
getters
.
getOptions
.
page
}
&_limit=
${
getters
.
getOptions
.
itemsPerPage
}
`
;
if
(
data
.
searchInput
)
{
pageLimit
=
""
;
}
let
sort
=
getters
.
getOptions
.
sortDesc
[
0
]
?
"desc"
:
"asc"
;
let
sort
=
getters
.
getOptions
.
sortDesc
[
0
]
?
"desc"
:
"asc"
;
let
sortBy
=
`&_sort=
${
getters
.
getOptions
.
sortBy
}
&_order=
${
sort
}
`
;
let
sortBy
=
`&_sort=
${
getters
.
getOptions
.
sortBy
}
&_order=
${
sort
}
`
;
...
@@ -32,11 +28,26 @@ export default {
...
@@ -32,11 +28,26 @@ export default {
});
});
},
},
searchData
({
commit
,
dispatch
},
{
data
,
column
})
{
commit
(
"setPageNumber"
);
dispatch
(
"setSearch"
,
data
);
dispatch
(
"setColumn"
,
column
);
dispatch
(
"fetchCustomerData"
);
},
setOptions
({
commit
,
dispatch
},
data
)
{
setOptions
({
commit
,
dispatch
},
data
)
{
commit
(
"setOptions"
,
data
);
commit
(
"setOptions"
,
data
);
dispatch
(
"fetchCustomerData"
);
dispatch
(
"fetchCustomerData"
);
},
},
setSearch
({
commit
},
data
)
{
commit
(
"setSearch"
,
data
);
},
setColumn
({
commit
},
data
)
{
commit
(
"setColumn"
,
data
);
},
closeDialog
({
commit
})
{
closeDialog
({
commit
})
{
commit
(
"setDialog"
,
false
);
commit
(
"setDialog"
,
false
);
},
},
...
...
client/src/modules/customers/store/getters.js
View file @
b0ccde72
...
@@ -52,4 +52,10 @@ export default {
...
@@ -52,4 +52,10 @@ export default {
totalCustomers
(
state
)
{
totalCustomers
(
state
)
{
return
state
.
totalCustomers
;
return
state
.
totalCustomers
;
},
},
getSearch
(
state
)
{
return
state
.
search
;
},
getColumn
(
state
)
{
return
state
.
column
;
},
};
};
client/src/modules/customers/store/mutations.js
View file @
b0ccde72
...
@@ -20,4 +20,13 @@ export default {
...
@@ -20,4 +20,13 @@ export default {
setTotalCustomers
(
state
,
data
)
{
setTotalCustomers
(
state
,
data
)
{
state
.
totalCustomers
=
data
;
state
.
totalCustomers
=
data
;
},
},
setSearch
(
state
,
data
)
{
state
.
search
=
data
;
},
setColumn
(
state
,
data
)
{
state
.
column
=
data
;
},
setPageNumber
(
state
)
{
state
.
options
.
page
=
1
;
},
};
};
client/src/modules/customers/store/state.js
View file @
b0ccde72
...
@@ -8,4 +8,6 @@ export default () => ({
...
@@ -8,4 +8,6 @@ export default () => ({
sortDesc
:
[
false
],
sortDesc
:
[
false
],
},
},
totalCustomers
:
0
,
totalCustomers
:
0
,
search
:
""
,
column
:
"all"
,
});
});
client/src/modules/products/index.vue
View file @
b0ccde72
...
@@ -7,7 +7,7 @@ export default {
...
@@ -7,7 +7,7 @@ export default {
return
{
return
{
selected
:
[],
selected
:
[],
search
:
""
,
search
:
""
,
column
:
""
,
column
:
"
all
"
,
};
};
},
},
computed
:
{
computed
:
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment