CIDWA/Censo_api
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

se actualizaron dependencias y corriguio movimientos

Browse Source
This commit is contained in:
evenegas
2026-07-28 23:21:30 -06:00
parent 08ed18ff4b
commit 1c6f92658d
3 changed files with 1684 additions and 1779 deletions
Download Patch File Download Diff File Expand all files Collapse all files
package-lock.json
Generated
+1657 -1755
View File
File diff suppressed because it is too large Load Diff
package.json
+19 -20
View File
@@ -20,14 +20,14 @@
"test:e2e": "jest --config ./test/jest-e2e.json"
},
"dependencies": {
"@nestjs/common": "^11.1.6",
"@nestjs/common": "^11.1.28",
"@nestjs/core": "^11.0.1",
"@nestjs/jwt": "^11.0.1",
"@nestjs/mapped-types": "*",
"@nestjs/jwt": "^11.0.2",
"@nestjs/mapped-types": "^2.1.1",
"@nestjs/passport": "^11.0.5",
"@nestjs/platform-express": "^11.0.1",
"@nestjs/schedule": "^6.0.1",
"@nestjs/typeorm": "^11.0.0",
"@nestjs/schedule": "^6.1.3",
"@nestjs/typeorm": "^11.0.3",
"axios": "^1.13.1",
"bcryptjs": "^3.0.2",
"class-transformer": "0.5.1",
@@ -39,36 +39,35 @@
"reflect-metadata": "^0.2.2",
"rxjs": "^7.8.1",
"typeor": "^1.2.0",
"typeorm": "^0.3.27",
"xlsx": "^0.18.5"
"typeorm": "^1.1.0"
},
"devDependencies": {
"@eslint/eslintrc": "^3.2.0",
"@eslint/eslintrc": "^3.3.6",
"@eslint/js": "^9.18.0",
"@nestjs/cli": "^11.0.0",
"@nestjs/config": "^4.0.2",
"@nestjs/schematics": "^11.0.0",
"@nestjs/testing": "^11.0.1",
"@nestjs/testing": "^11.1.28",
"@types/bcrypt": "^6.0.0",
"@types/express": "^5.0.0",
"@types/express": "^5.0.6",
"@types/jest": "^30.0.0",
"@types/node": "^22.10.7",
"@types/node": "^22.20.1",
"@types/passport-jwt": "^4.0.1",
"@types/supertest": "^6.0.2",
"eslint": "^9.18.0",
"eslint": "^10.8.0",
"eslint-config-prettier": "^10.0.1",
"eslint-plugin-prettier": "^5.2.2",
"globals": "^16.0.0",
"jest": "^30.0.0",
"prettier": "^3.4.2",
"eslint-plugin-prettier": "^5.5.6",
"globals": "^16.5.0",
"jest": "^30.4.2",
"prettier": "^3.9.6",
"source-map-support": "^0.5.21",
"supertest": "^7.0.0",
"ts-jest": "^29.2.5",
"ts-loader": "^9.5.2",
"supertest": "^7.2.2",
"ts-jest": "^29.4.12",
"ts-loader": "^9.6.2",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.7.3",
"typescript-eslint": "^8.20.0"
"typescript-eslint": "^8.65.0"
},
"jest": {
"moduleFileExtensions": [
src/equipo/equipo.service.ts
+8 -4
View File
@@ -1566,7 +1566,7 @@ export class EquipoService {
async tablaExcel(filtros?: FiltrosTablaDto) {
const qb = this.equipoRepository
.createQueryBuilder('equipo')
.select(['*'])
.select('equipo')
.distinct(true);
qb.leftJoin('equipo.adscripcion', 'adscripcion');
@@ -1609,7 +1609,7 @@ export class EquipoService {
if (filtros?.sistemas?.length) {
if (tieneFiltroReal(filtros.sistemas)) {
qb.andWhere('sistemaOperativo.id_sistema_operativo IN (:...sistemas)', {
qb.andWhere('so.id_sistema_operativo IN (:...sistemas)', {
sistemas: filtros.sistemas
});
}
@@ -1637,8 +1637,12 @@ export class EquipoService {
const data = await qb
.orderBy(`equipo.inventario`, 'ASC')
.addOrderBy('mov.fechaMovimiento', 'ASC')
.getRawMany();
console.log(data)
const map = new Map(data.map(item => [item.inventario, item]));
const workbook = new ExcelJS.Workbook();
const sheet = workbook.addWorksheet('Equipos');
@@ -1666,7 +1670,7 @@ export class EquipoService {
sheet.columns = columns;
data.forEach(row => {
map.forEach(row => {
sheet.addRow(row);
});