Skip to content

Commit

Permalink
Implement transaction-account-adjacent api and minor amendments
Browse files Browse the repository at this point in the history
  • Loading branch information
ghacupha committed Nov 20, 2024
1 parent 0cbbc3b commit 4daa98c
Show file tree
Hide file tree
Showing 12 changed files with 115 additions and 392 deletions.
6 changes: 0 additions & 6 deletions .vscode/settings.json

This file was deleted.

2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 13 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,13 @@
<artifactId>rxjava</artifactId>
<version>2.2.21</version>
</dependency>

<!-- https://mvnrepository.com/artifact/javax.servlet/javax.servlet-api -->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<version>4.0.1</version>
<scope>provided</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/com.opencsv/opencsv -->
<dependency>
Expand Down Expand Up @@ -201,22 +207,22 @@
<version>6.3.0</version>
</dependency>
<!-- https://mvnrepository.com/artifact/net.sourceforge.dynamicreports/dynamicreports-core -->
<dependency>
<!--<dependency>
<groupId>net.sourceforge.dynamicreports</groupId>
<artifactId>dynamicreports-core</artifactId>
<version>${dynamicreports.version}</version>
</dependency>
</dependency>-->
<!-- https://mvnrepository.com/artifact/net.sourceforge.dynamicreports/dynamicreports-adhoc -->
<dependency>
<!--<dependency>
<groupId>net.sourceforge.dynamicreports</groupId>
<artifactId>dynamicreports-adhoc</artifactId>
<version>${dynamicreports.version}</version>
</dependency>
<dependency>
</dependency>-->
<!--<dependency>
<groupId>net.sourceforge.dynamicreports</groupId>
<artifactId>dynamicreports-googlecharts</artifactId>
<version>${dynamicreports.version}</version>
</dependency>
</dependency>-->

<!-- https://mvnrepository.com/artifact/commons-fileupload/commons-fileupload -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.slf4j.LoggerFactory;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.http.HttpHeaders;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
Expand Down Expand Up @@ -75,10 +76,11 @@ public TransactionAccountReportItemResourceProd(
@GetMapping("/transaction-account-report-items")
public ResponseEntity<List<TransactionAccountReportItemDTO>> getAllTransactionAccountReportItems(
TransactionAccountReportItemCriteria criteria,
@RequestParam(value = "reportDate", required = false) @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate reportDate,
Pageable pageable
) {
log.debug("REST request to get TransactionAccountReportItems by criteria: {}", criteria);
Page<TransactionAccountReportItemDTO> page = transactionAccountReportItemService.findAll(LocalDate.of(2024,7,31), pageable);
Page<TransactionAccountReportItemDTO> page = transactionAccountReportItemService.findAll(reportDate, pageable);
HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page);
return ResponseEntity.ok().headers(headers).body(page.getContent());
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ public ResponseEntity<PrepaymentAccountDTO> partialUpdatePrepaymentAccount(
@GetMapping("/prepayment-accounts")
public ResponseEntity<List<PrepaymentAccountDTO>> getAllPrepaymentAccounts(PrepaymentAccountCriteria criteria, Pageable pageable) {
log.debug("REST request to get PrepaymentAccounts by criteria: {}", criteria);
Page<PrepaymentAccountDTO> page = prepaymentAccountQueryService.findByCriteria(criteria, pageable);
Page<PrepaymentAccountDTO> page = prepaymentAccountService.findByCriteria(criteria, pageable);
HttpHeaders headers = PaginationUtil.generatePaginationHttpHeaders(ServletUriComponentsBuilder.fromCurrentRequest(), page);
return ResponseEntity.ok().headers(headers).body(page.getContent());
}
Expand Down

This file was deleted.

This file was deleted.

42 changes: 0 additions & 42 deletions src/main/java/io/github/erp/internal/report/dynamic/Templates.java

This file was deleted.

Loading

0 comments on commit 4daa98c

Please sign in to comment.