hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'develop' of github.com:Frappet/hrms-api-org into develop

Browse source 
# Conflicts:
#	src/controllers/ReportController.ts
This commit is contained in:
kittapath 2025-03-07 11:31:39 +07:00
commit 747b8e807a
4 changed files with 35 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/controllers/ReportController.ts
View file

@ -31,6 +31,7 @@ import { Profile } from "../entities/Profile";
import { viewRegistryOfficer } from "../entities/view/viewRegistryOfficer";
import { viewRegistryEmployee } from "../entities/view/viewRegistryEmployee";
import { EmployeeTempPosMaster } from "../entities/EmployeeTempPosMaster";
// import { sendWebSocket } from "../services/webSocket";
@Route("api/v1/org/report")
@Tags("Report")
@ -1367,6 +1368,7 @@ export class ReportController extends Controller {
}
}
}
return new HttpSuccess({ template: "report1", reportName: "report1", data: { data } });
}
@ -3535,7 +3537,13 @@ export class ReportController extends Controller {
}
}
}
<<<<<<< HEAD
=======
// const metaData = { template: "report2", reportName: "report2", data: { data } };
// sendWebSocket(metaData)
>>>>>>> b24a900198a2e83d621975fe9d657157de8ffccf
return new HttpSuccess({ template: "report2", reportName: "report2", data: { data } });
}