Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
LaMartin-Webomagic
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Deep Dey
LaMartin-Webomagic
Commits
070cf687
Commit
070cf687
authored
Jul 04, 2024
by
Deep Dey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: add new filter option for admission form listing page
parent
99064cd3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
5 deletions
+15
-5
lamartinDashboard/dashboard.html
lamartinDashboard/dashboard.html
+5
-1
lamartinDashboard/js/dashboard.js
lamartinDashboard/js/dashboard.js
+10
-4
No files found.
lamartinDashboard/dashboard.html
View file @
070cf687
...
@@ -19,7 +19,7 @@
...
@@ -19,7 +19,7 @@
<div
class=
"container"
>
<div
class=
"container"
>
<div
class=
"row"
>
<div
class=
"row"
>
<div
class=
"col-lg-3"
style=
"margin-top:
110
px;"
>
<div
class=
"col-lg-3"
style=
"margin-top:
45
px;"
>
<div
class=
"navbar-filter"
>
<div
class=
"navbar-filter"
>
<!-- <h5>Filters</h5>
<!-- <h5>Filters</h5>
<hr /> -->
<hr /> -->
...
@@ -39,6 +39,10 @@
...
@@ -39,6 +39,10 @@
<label
for=
"timeFilter"
class=
"filter-label"
>
Interaction Time
</label>
<label
for=
"timeFilter"
class=
"filter-label"
>
Interaction Time
</label>
<input
type=
"time"
id=
"timeFilter"
class=
"form-control"
/>
<input
type=
"time"
id=
"timeFilter"
class=
"form-control"
/>
</div>
</div>
<div
class=
"filter-box"
>
<label
for=
"emailFilter"
class=
"filter-label"
>
Correspondence Email
</label>
<input
type=
"email"
id=
"emailFilter"
class=
"form-control"
/>
</div>
<button
id=
"applyFilters"
class=
"btn btn-primary btn-block"
>
Apply Filters
</button>
<button
id=
"applyFilters"
class=
"btn btn-primary btn-block"
>
Apply Filters
</button>
<button
id=
"resetFilters"
class=
"btn btn-secondary btn-block mt-2"
>
Reset Filters
</button>
<button
id=
"resetFilters"
class=
"btn btn-secondary btn-block mt-2"
>
Reset Filters
</button>
</div>
</div>
...
...
lamartinDashboard/js/dashboard.js
View file @
070cf687
...
@@ -7,7 +7,7 @@ $(document).ready(function () {
...
@@ -7,7 +7,7 @@ $(document).ready(function () {
}
}
// initially display all admission data
// initially display all admission data
getAdmissionData
(
null
,
null
,
null
,
null
);
getAdmissionData
(
null
,
null
,
null
,
null
,
null
);
function
displayFilteredStudents
()
{
function
displayFilteredStudents
()
{
var
filteredData
=
studentData
;
var
filteredData
=
studentData
;
...
@@ -39,7 +39,8 @@ $(document).ready(function () {
...
@@ -39,7 +39,8 @@ $(document).ready(function () {
schoolName
,
schoolName
,
className
,
className
,
interactionDate
,
interactionDate
,
interactionTime
interactionTime
,
correspondenceEmail
)
{
)
{
let
queryData
=
{};
let
queryData
=
{};
...
@@ -52,6 +53,9 @@ $(document).ready(function () {
...
@@ -52,6 +53,9 @@ $(document).ready(function () {
if
(
interactionDate
)
{
if
(
interactionDate
)
{
queryData
.
interactionDate
=
interactionDate
;
queryData
.
interactionDate
=
interactionDate
;
}
}
if
(
correspondenceEmail
)
{
queryData
.
correspondenceEmail
=
correspondenceEmail
;
}
if
(
interactionTime
)
{
if
(
interactionTime
)
{
let
currentDate
=
new
Date
().
toISOString
().
split
(
'
T
'
)[
0
];
let
currentDate
=
new
Date
().
toISOString
().
split
(
'
T
'
)[
0
];
var
selectedDateTime
=
new
Date
(
var
selectedDateTime
=
new
Date
(
...
@@ -108,7 +112,8 @@ $(document).ready(function () {
...
@@ -108,7 +112,8 @@ $(document).ready(function () {
var
schoolFilter
=
$
(
'
#schoolFilter
'
).
val
();
var
schoolFilter
=
$
(
'
#schoolFilter
'
).
val
();
var
dateFilter
=
$
(
'
#dateFilter
'
).
val
();
var
dateFilter
=
$
(
'
#dateFilter
'
).
val
();
var
timeFilter
=
$
(
'
#timeFilter
'
).
val
();
var
timeFilter
=
$
(
'
#timeFilter
'
).
val
();
getAdmissionData
(
schoolFilter
,
null
,
dateFilter
,
timeFilter
);
var
emailFilter
=
$
(
'
#emailFilter
'
).
val
();
getAdmissionData
(
schoolFilter
,
null
,
dateFilter
,
timeFilter
,
emailFilter
);
});
});
// Reset filters button click event
// Reset filters button click event
...
@@ -116,7 +121,8 @@ $(document).ready(function () {
...
@@ -116,7 +121,8 @@ $(document).ready(function () {
$
(
'
#schoolFilter
'
).
val
(
''
);
$
(
'
#schoolFilter
'
).
val
(
''
);
$
(
'
#dateFilter
'
).
val
(
''
);
$
(
'
#dateFilter
'
).
val
(
''
);
$
(
'
#timeFilter
'
).
val
(
''
);
$
(
'
#timeFilter
'
).
val
(
''
);
getAdmissionData
(
null
,
null
,
null
,
null
);
$
(
'
#emailFilter
'
).
val
(
''
);
getAdmissionData
(
null
,
null
,
null
,
null
,
null
);
});
});
// Select all checkbox click event
// Select all checkbox click event
...
...
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