Commit 3cf8f614 authored by Deep Dey's avatar Deep Dey

fix: templates issues

parent 1babcc6d
...@@ -395,13 +395,14 @@ public class AdmissionFormController { ...@@ -395,13 +395,14 @@ public class AdmissionFormController {
HttpServletResponse response, HttpServletResponse response,
@RequestParam("apikey") String apiKey, @RequestParam("apikey") String apiKey,
@RequestParam String schoolName, @RequestParam String schoolName,
@RequestParam String interactionDate @RequestParam String interactionDate,
@RequestParam String className
) throws Exception { ) throws Exception {
List<AdmissionFormData> admissionFormDataList = List<AdmissionFormData> admissionFormDataList =
this.admissionFormDAOController.getAdmissionFormDataList( this.admissionFormDAOController.getAdmissionFormDataList(
schoolName, schoolName,
null, className,
interactionDate, interactionDate,
null, null,
null, null,
...@@ -436,13 +437,14 @@ public class AdmissionFormController { ...@@ -436,13 +437,14 @@ public class AdmissionFormController {
HttpServletResponse response, HttpServletResponse response,
@RequestParam("apikey") String apiKey, @RequestParam("apikey") String apiKey,
@RequestParam String schoolName, @RequestParam String schoolName,
@RequestParam String interactionDate @RequestParam String interactionDate,
@RequestParam String className
) throws Exception { ) throws Exception {
List<AdmissionFormData> admissionFormDataList = List<AdmissionFormData> admissionFormDataList =
this.admissionFormDAOController.getAdmissionFormDataList( this.admissionFormDAOController.getAdmissionFormDataList(
schoolName, schoolName,
null, className,
interactionDate, interactionDate,
null, null,
null, null,
...@@ -477,13 +479,14 @@ public class AdmissionFormController { ...@@ -477,13 +479,14 @@ public class AdmissionFormController {
HttpServletResponse response, HttpServletResponse response,
@RequestParam("apikey") String apiKey, @RequestParam("apikey") String apiKey,
@RequestParam String schoolName, @RequestParam String schoolName,
@RequestParam String interactionDate @RequestParam String interactionDate,
@RequestParam String className
) throws Exception { ) throws Exception {
List<AdmissionFormData> admissionFormDataList = List<AdmissionFormData> admissionFormDataList =
this.admissionFormDAOController.getAdmissionFormDataList( this.admissionFormDAOController.getAdmissionFormDataList(
schoolName, schoolName,
null, className,
interactionDate, interactionDate,
null, null,
null, null,
...@@ -518,13 +521,14 @@ public class AdmissionFormController { ...@@ -518,13 +521,14 @@ public class AdmissionFormController {
HttpServletResponse response, HttpServletResponse response,
@RequestParam("apikey") String apiKey, @RequestParam("apikey") String apiKey,
@RequestParam String schoolName, @RequestParam String schoolName,
@RequestParam String interactionDate @RequestParam String interactionDate,
@RequestParam String className
) throws Exception { ) throws Exception {
List<AdmissionFormData> admissionFormDataList = List<AdmissionFormData> admissionFormDataList =
this.admissionFormDAOController.getAdmissionFormDataList( this.admissionFormDAOController.getAdmissionFormDataList(
schoolName, schoolName,
null, className,
interactionDate, interactionDate,
null, null,
null, null,
...@@ -567,13 +571,14 @@ public class AdmissionFormController { ...@@ -567,13 +571,14 @@ public class AdmissionFormController {
HttpServletResponse response, HttpServletResponse response,
@RequestParam("apikey") String apiKey, @RequestParam("apikey") String apiKey,
@RequestParam String schoolName, @RequestParam String schoolName,
@RequestParam String admissionDate @RequestParam String admissionDate,
@RequestParam String className
) throws Exception { ) throws Exception {
List<AdmissionFormData> admissionFormDataList = List<AdmissionFormData> admissionFormDataList =
this.admissionFormDAOController.getAdmissionFormDataList( this.admissionFormDAOController.getAdmissionFormDataList(
schoolName, schoolName,
null, className,
null, null,
null, null,
null, null,
...@@ -611,13 +616,14 @@ public class AdmissionFormController { ...@@ -611,13 +616,14 @@ public class AdmissionFormController {
HttpServletResponse response, HttpServletResponse response,
@RequestParam("apikey") String apiKey, @RequestParam("apikey") String apiKey,
@RequestParam String schoolName, @RequestParam String schoolName,
@RequestParam String admissionDate @RequestParam String admissionDate,
@RequestParam String className
) throws Exception { ) throws Exception {
List<AdmissionFormData> admissionFormDataList = List<AdmissionFormData> admissionFormDataList =
this.admissionFormDAOController.getAdmissionFormDataList( this.admissionFormDAOController.getAdmissionFormDataList(
schoolName, schoolName,
null, className,
null, null,
null, null,
null, null,
......
...@@ -6,7 +6,7 @@ spring.datasource.url=jdbc:postgresql://land.websofttechs.com:5432/webomagic_lam ...@@ -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.web.resources.cache.cachecontrol.s-max-age=3600000
spring.datasource.username=webomagic_python_db spring.datasource.username=webomagic_python_db
spring.datasource.password=P@$$w0rdIITKGP spring.datasource.password=P@$$w0rdIITKGP
spring.redis.host=localhost spring.redis.host=land.websofttechs.com
spring.redis.port=6379 spring.redis.port=6379
spring.mail.host=smtp.gmail.com spring.mail.host=smtp.gmail.com
spring.mail.port=587 spring.mail.port=587
......
...@@ -74,14 +74,14 @@ ...@@ -74,14 +74,14 @@
<th>SL. NO.</th> <th>SL. NO.</th>
<th>Reference Id</th> <th>Reference Id</th>
<th>Name</th> <th>Name</th>
<th>Father's Name</th> <th>Class</th>
<th>Interaction Time</th> <th>Interaction Time</th>
</tr> </tr>
<tr th:each="admissionForm, iterStat : ${admissionFormList}"> <tr th:each="admissionForm, iterStat : ${admissionFormList}">
<td th:text="${iterStat.count}">1</td> <td th:text="${iterStat.count}">1</td>
<td th:text="${admissionForm.fatherEmail}">VIVANN SURANA</td> <td th:text="${admissionForm.fatherEmail}">VIVANN SURANA</td>
<td th:text="${admissionForm.fullName}">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> <td th:text="${admissionForm.interactionTime}">10:00 AM</td>
</tr> </tr>
</table> </table>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment