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
3cf8f614
Commit
3cf8f614
authored
Feb 26, 2025
by
Deep Dey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: templates issues
parent
1babcc6d
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
15 deletions
+21
-15
lamartinBackend/src/main/java/com/example/LaMartin/admission/controller/AdmissionFormController.java
...aMartin/admission/controller/AdmissionFormController.java
+18
-12
lamartinBackend/src/main/resources/application-dev.properties
...rtinBackend/src/main/resources/application-dev.properties
+1
-1
lamartinBackend/src/main/resources/templates/InteractionMasterTemplate.html
...c/main/resources/templates/InteractionMasterTemplate.html
+2
-2
No files found.
lamartinBackend/src/main/java/com/example/LaMartin/admission/controller/AdmissionFormController.java
View file @
3cf8f614
...
...
@@ -395,13 +395,14 @@ public class AdmissionFormController {
HttpServletResponse
response
,
@RequestParam
(
"apikey"
)
String
apiKey
,
@RequestParam
String
schoolName
,
@RequestParam
String
interactionDate
@RequestParam
String
interactionDate
,
@RequestParam
String
className
)
throws
Exception
{
List
<
AdmissionFormData
>
admissionFormDataList
=
this
.
admissionFormDAOController
.
getAdmissionFormDataList
(
schoolName
,
null
,
className
,
interactionDate
,
null
,
null
,
...
...
@@ -436,13 +437,14 @@ public class AdmissionFormController {
HttpServletResponse
response
,
@RequestParam
(
"apikey"
)
String
apiKey
,
@RequestParam
String
schoolName
,
@RequestParam
String
interactionDate
@RequestParam
String
interactionDate
,
@RequestParam
String
className
)
throws
Exception
{
List
<
AdmissionFormData
>
admissionFormDataList
=
this
.
admissionFormDAOController
.
getAdmissionFormDataList
(
schoolName
,
null
,
className
,
interactionDate
,
null
,
null
,
...
...
@@ -477,13 +479,14 @@ public class AdmissionFormController {
HttpServletResponse
response
,
@RequestParam
(
"apikey"
)
String
apiKey
,
@RequestParam
String
schoolName
,
@RequestParam
String
interactionDate
@RequestParam
String
interactionDate
,
@RequestParam
String
className
)
throws
Exception
{
List
<
AdmissionFormData
>
admissionFormDataList
=
this
.
admissionFormDAOController
.
getAdmissionFormDataList
(
schoolName
,
null
,
className
,
interactionDate
,
null
,
null
,
...
...
@@ -518,13 +521,14 @@ public class AdmissionFormController {
HttpServletResponse
response
,
@RequestParam
(
"apikey"
)
String
apiKey
,
@RequestParam
String
schoolName
,
@RequestParam
String
interactionDate
@RequestParam
String
interactionDate
,
@RequestParam
String
className
)
throws
Exception
{
List
<
AdmissionFormData
>
admissionFormDataList
=
this
.
admissionFormDAOController
.
getAdmissionFormDataList
(
schoolName
,
null
,
className
,
interactionDate
,
null
,
null
,
...
...
@@ -567,13 +571,14 @@ public class AdmissionFormController {
HttpServletResponse
response
,
@RequestParam
(
"apikey"
)
String
apiKey
,
@RequestParam
String
schoolName
,
@RequestParam
String
admissionDate
@RequestParam
String
admissionDate
,
@RequestParam
String
className
)
throws
Exception
{
List
<
AdmissionFormData
>
admissionFormDataList
=
this
.
admissionFormDAOController
.
getAdmissionFormDataList
(
schoolName
,
null
,
className
,
null
,
null
,
null
,
...
...
@@ -611,13 +616,14 @@ public class AdmissionFormController {
HttpServletResponse
response
,
@RequestParam
(
"apikey"
)
String
apiKey
,
@RequestParam
String
schoolName
,
@RequestParam
String
admissionDate
@RequestParam
String
admissionDate
,
@RequestParam
String
className
)
throws
Exception
{
List
<
AdmissionFormData
>
admissionFormDataList
=
this
.
admissionFormDAOController
.
getAdmissionFormDataList
(
schoolName
,
null
,
className
,
null
,
null
,
null
,
...
...
lamartinBackend/src/main/resources/application-dev.properties
View file @
3cf8f614
...
...
@@ -6,7 +6,7 @@ spring.datasource.url=jdbc:postgresql://land.websofttechs.com:5432/webomagic_lam
spring.web.resources.cache.cachecontrol.s-max-age
=
3600000
spring.datasource.username
=
webomagic_python_db
spring.datasource.password
=
P@$$w0rdIITKGP
spring.redis.host
=
l
ocalhost
spring.redis.host
=
l
and.websofttechs.com
spring.redis.port
=
6379
spring.mail.host
=
smtp.gmail.com
spring.mail.port
=
587
...
...
lamartinBackend/src/main/resources/templates/InteractionMasterTemplate.html
View file @
3cf8f614
...
...
@@ -74,14 +74,14 @@
<th>
SL. NO.
</th>
<th>
Reference Id
</th>
<th>
Name
</th>
<th>
Father's Name
</th>
<th>
Class
</th>
<th>
Interaction Time
</th>
</tr>
<tr
th:each=
"admissionForm, iterStat : ${admissionFormList}"
>
<td
th:text=
"${iterStat.count}"
>
1
</td>
<td
th:text=
"${admissionForm.fatherEmail}"
>
VIVANN SURANA
</td>
<td
th:text=
"${admissionForm.fullName}"
>
VIVANN SURANA
</td>
<td
th:text=
"${admissionForm.
fatherName
}"
>
Upper Nursery
</td>
<td
th:text=
"${admissionForm.
admissionClass
}"
>
Upper Nursery
</td>
<td
th:text=
"${admissionForm.interactionTime}"
>
10:00 AM
</td>
</tr>
</table>
...
...
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