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
6ac19e7a
Commit
6ac19e7a
authored
Aug 14, 2026
by
Deep Dey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: add session year for admission form download modal
parent
2e9dd73d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
49 additions
and
9 deletions
+49
-9
.vscode/settings.json
.vscode/settings.json
+3
-0
lamartinBackend/src/main/java/com/example/LaMartin/admission/controller/AdmissionFormController.java
...aMartin/admission/controller/AdmissionFormController.java
+4
-3
lamartinBackend/src/main/resources/META-INF/additional-spring-configuration-metadata.json
...es/META-INF/additional-spring-configuration-metadata.json
+22
-0
lamartinDashboard/dashboard.html
lamartinDashboard/dashboard.html
+10
-2
lamartinDashboard/js/dashboard.js
lamartinDashboard/js/dashboard.js
+10
-4
No files found.
.vscode/settings.json
0 → 100644
View file @
6ac19e7a
{
"java.compile.nullAnalysis.mode"
:
"disabled"
}
\ No newline at end of file
lamartinBackend/src/main/java/com/example/LaMartin/admission/controller/AdmissionFormController.java
View file @
6ac19e7a
...
...
@@ -649,7 +649,8 @@ public class AdmissionFormController {
@RequestParam
(
"apikey"
)
String
apiKey
,
@RequestParam
String
schoolName
,
@RequestParam
String
admissionDate
,
@RequestParam
String
className
@RequestParam
String
className
,
@RequestParam
String
sessionYear
)
throws
Exception
{
List
<
AdmissionFormData
>
admissionFormDataList
=
...
...
@@ -662,7 +663,7 @@ public class AdmissionFormController {
admissionDate
,
null
,
null
,
null
sessionYear
);
if
(
admissionFormDataList
.
isEmpty
())
{
...
...
lamartinBackend/src/main/resources/META-INF/additional-spring-configuration-metadata.json
0 → 100644
View file @
6ac19e7a
{
"properties"
:
[
{
"name"
:
"lamartin.static.resources.root.path"
,
"type"
:
"java.lang.String"
,
"description"
:
"A description for 'lamartin.static.resources.root.path'"
},
{
"name"
:
"lamartin.static.server.path"
,
"type"
:
"java.lang.String"
,
"description"
:
"A description for 'lamartin.static.server.path'"
},
{
"name"
:
"lamartin.username"
,
"type"
:
"java.lang.String"
,
"description"
:
"A description for 'lamartin.username'"
},
{
"name"
:
"lamartin.password"
,
"type"
:
"java.lang.String"
,
"description"
:
"A description for 'lamartin.password'"
}
]}
\ No newline at end of file
lamartinDashboard/dashboard.html
View file @
6ac19e7a
...
...
@@ -296,6 +296,14 @@
</div>
<div
class=
"modal-body"
>
<div
style=
"display: flex; justify-content: space-between;"
>
<div
class=
"form-group"
style=
"width: 49%;"
>
<label
for=
"admissionSessionFilterReport"
class=
"filter-label"
>
Session
</label>
<select
id=
"admissionSessionFilterReport"
class=
"form-control"
required
>
<option
value=
"2025-2026"
>
2025-2026
</option>
<option
value=
"2026-2027"
selected
>
2026-2027
</option>
<option
value=
"2027-2028"
>
2027-2028
</option>
</select>
</div>
<div
class=
"form-group"
style=
"width: 49%;"
>
<label
for=
"admissionSchoolFilterReport"
class=
"filter-label"
>
School
</label>
<select
id=
"admissionSchoolFilterReport"
class=
"form-control"
required
>
...
...
@@ -303,12 +311,12 @@
<option
value=
"La Martiniere for Girls"
>
La Martiniere for Girls
</option>
</select>
</div>
</div>
<div
style=
"display: flex; justify-content: space-between;"
>
<div
class=
"form-group"
style=
"width: 49%;"
>
<label
for=
"admissionDateFilterReport"
class=
"filter-label"
>
Admission Date
</label>
<input
type=
"date"
id=
"admissionDateFilterReport"
class=
"form-control"
/>
</div>
</div>
<div
style=
"display: flex; justify-content: center;"
>
<div
class=
"form-group"
style=
"width: 49%;"
>
<label
for=
"admissionClassFilterReport"
class=
"filter-label"
>
Class
</label>
<select
id=
"admissionClassFilterReport"
class=
"form-control"
>
...
...
lamartinDashboard/js/dashboard.js
View file @
6ac19e7a
...
...
@@ -420,13 +420,14 @@ $(document).ready(function () {
$
(
'
#download-admission-excel-btn
'
).
click
(
function
()
{
let
schoolName
=
$
(
'
#admissionSchoolFilterReport
'
).
val
();
let
admissionDate
=
$
(
'
#admissionDateFilterReport
'
).
val
();
let
className
=
$
(
'
#classFilterReport
'
).
val
();
let
className
=
$
(
'
#admissionClassFilterReport
'
).
val
();
let
sessionYear
=
$
(
'
#admissionSessionFilterReport
'
).
val
();
if
(
!
schoolName
||
!
admissionDate
)
{
$
(
'
#
r
eportModal
'
).
modal
(
'
hide
'
);
$
(
'
#
admissionR
eportModal
'
).
modal
(
'
hide
'
);
$
(
'
#messageModal .modal-title
'
).
text
(
'
Error
'
);
$
(
'
#messageModal .modal-body
'
).
text
(
'
Please select school,class and date to download
counsellor scoring sheet
.
'
'
Please select school,class and date to download
admission excel
.
'
);
$
(
'
#messageModal
'
).
modal
(
'
show
'
);
return
;
...
...
@@ -443,6 +444,8 @@ $(document).ready(function () {
className
}
&admissionDate=
${
admissionDate
}
&sessionYear=
${
sessionYear
}
`
,
'
_blank
'
)
...
...
@@ -457,7 +460,8 @@ $(document).ready(function () {
$
(
'
#downloadAdmissionFormList
'
).
click
(
function
()
{
let
schoolName
=
$
(
'
#admissionSchoolFilterReport
'
).
val
();
let
admissionDate
=
$
(
'
#admissionDateFilterReport
'
).
val
();
let
className
=
$
(
'
#classFilterReport
'
).
val
();
let
className
=
$
(
'
#admissionClassFilterReport
'
).
val
();
let
sessionYear
=
$
(
'
#admissionSessionFilterReport
'
).
val
();
if
(
!
schoolName
||
!
admissionDate
)
{
$
(
'
#admissionReportModal
'
).
modal
(
'
hide
'
);
...
...
@@ -480,6 +484,8 @@ $(document).ready(function () {
className
}
&admissionDate=
${
admissionDate
}
&sessionYear=
${
sessionYear
}
`
,
'
_blank
'
)
...
...
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