Merge branch 'Feature/salary-aid/client-api' into Main
This commit is contained in:
@@ -60,6 +60,20 @@ public class SalaryAidController:ClientBaseController
|
||||
return result;
|
||||
}
|
||||
|
||||
public ActionResult<EditSalaryAidRequest> EditDetails(long id)
|
||||
{
|
||||
var data = _salaryAidApplication.GetDetails(id);
|
||||
var res = new EditSalaryAidRequest()
|
||||
{
|
||||
Id = data.Id,
|
||||
Amount = data.Amount.MoneyToDouble(),
|
||||
CalculationMonth = data.CalculationMonth,
|
||||
CalculationYear = data.CalculationYear,
|
||||
SalaryDateTime = data.SalaryDateTime,
|
||||
};
|
||||
return res;
|
||||
}
|
||||
|
||||
[HttpDelete("{id:long}")]
|
||||
public ActionResult<OperationResult> Delete(long id)
|
||||
{
|
||||
@@ -67,7 +81,7 @@ public class SalaryAidController:ClientBaseController
|
||||
return result;
|
||||
}
|
||||
[HttpPost("validate-excel")]
|
||||
public ActionResult<ExcelValidation<SalaryAidImportData>> ValidateExcel(IFormFile excel)
|
||||
public ActionResult<ExcelValidation<SalaryAidImportData>> ValidateExcel([FromForm]IFormFile excel)
|
||||
{
|
||||
var validation = _salaryAidImportExcel.ReadAndValidateExcel(excel, _workshopId);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user