Commit 2f2a6dfa authored by Deep Dey's avatar Deep Dey

fix: stop dynamic year change

parent 1d7f010c
...@@ -17,11 +17,19 @@ import java.util.List; ...@@ -17,11 +17,19 @@ import java.util.List;
import java.util.Objects; import java.util.Objects;
@Service @Service
@AllArgsConstructor(onConstructor_ = @__({@Autowired})) // @AllArgsConstructor(onConstructor_ = @__({@Autowired}))
public class TemplateService { public class TemplateService {
private final TemplateEngine templateEngine; private final TemplateEngine templateEngine;
private final Settings settings; private final Settings settings;
private final int associationYear = 2024;
public TemplateService(TemplateEngine templateEngine, Settings settings) {
this.templateEngine = templateEngine;
this.settings = settings;
}
public String generateAdmissionFormListTemplate(List<AdmissionFormData> admissionFormDataList) { public String generateAdmissionFormListTemplate(List<AdmissionFormData> admissionFormDataList) {
Context context = new Context(); Context context = new Context();
...@@ -33,7 +41,7 @@ public class TemplateService { ...@@ -33,7 +41,7 @@ public class TemplateService {
public String generateAdmissionConfirmationFormTemplate(@NotNull AdmissionFormData admissionFormData) { public String generateAdmissionConfirmationFormTemplate(@NotNull AdmissionFormData admissionFormData) {
LocalDate date = LocalDate.parse(admissionFormData.getAdmissionDate()); LocalDate date = LocalDate.parse(admissionFormData.getAdmissionDate());
String givenYear = admissionFormData.getAdmissionDate().substring(0, 4); String givenYear = String.valueOf(associationYear);
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy");
admissionFormData.setAdmissionDate(date.format(formatter)); admissionFormData.setAdmissionDate(date.format(formatter));
...@@ -67,7 +75,7 @@ public class TemplateService { ...@@ -67,7 +75,7 @@ public class TemplateService {
public String generateAdmissionConfirmationFormListTemplate(@NotNull List<AdmissionFormData> admissionFormDataList) { public String generateAdmissionConfirmationFormListTemplate(@NotNull List<AdmissionFormData> admissionFormDataList) {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("dd-MM-yyyy");
String givenYear = admissionFormDataList.get(0).getAdmissionDate().substring(0, 4); String givenYear = String.valueOf(associationYear);
for (AdmissionFormData admissionFormData : admissionFormDataList) { for (AdmissionFormData admissionFormData : admissionFormDataList) {
LocalDate date = LocalDate.parse(admissionFormData.getAdmissionDate()); LocalDate date = LocalDate.parse(admissionFormData.getAdmissionDate());
admissionFormData.setAdmissionDate(date.format(formatter)); admissionFormData.setAdmissionDate(date.format(formatter));
...@@ -104,7 +112,7 @@ public class TemplateService { ...@@ -104,7 +112,7 @@ public class TemplateService {
} }
public String generateCounsellorScoringTemplate(@NotNull List<AdmissionFormData> admissionFormDataList) { public String generateCounsellorScoringTemplate(@NotNull List<AdmissionFormData> admissionFormDataList) {
String givenYear = admissionFormDataList.get(0).getInteractionDate().substring(0, 4); String givenYear = String.valueOf(associationYear);
Context context = new Context(); Context context = new Context();
context.setVariable("serverPath", settings.getStaticServerPath()); context.setVariable("serverPath", settings.getStaticServerPath());
context.setVariable("admissionFormList", admissionFormDataList); context.setVariable("admissionFormList", admissionFormDataList);
...@@ -114,7 +122,7 @@ public class TemplateService { ...@@ -114,7 +122,7 @@ public class TemplateService {
} }
public String generateInteractionScoringTemplate(@NotNull List<AdmissionFormData> admissionFormDataList) { public String generateInteractionScoringTemplate(@NotNull List<AdmissionFormData> admissionFormDataList) {
String givenYear = admissionFormDataList.get(0).getInteractionDate().substring(0, 4); String givenYear = String.valueOf(associationYear);
Context context = new Context(); Context context = new Context();
context.setVariable("serverPath", settings.getStaticServerPath()); context.setVariable("serverPath", settings.getStaticServerPath());
context.setVariable("admissionFormList", admissionFormDataList); context.setVariable("admissionFormList", admissionFormDataList);
......
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