Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix stats excel #3115

Merged
merged 2 commits into from
Dec 18, 2023
Merged

Fix stats excel #3115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdea6e0
fix(stats): fix dump & file stats
pYassine Dec 18, 2023
f88506c
fix(open-data): fix build
pYassine Dec 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .talismanrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fileignoreconfig:
- filename: packages/backend/src/_migrations/1702483465656-auto-migration.ts
checksum: 2dbc2450c1df10f68a54897946318976bf8163711f3143e0608ce6c0e7275447
- filename: packages/backend/src/_migrations/_init-db/1603812391580-pr-env-create-database.ts
checksum: 5e9ab65fc62b00a2a2092ccbcf0e2c9fdecefe418452b15b579425774cc1e1e2
checksum: ed72b9f80448ddaa06717a97f4f98a01cfca8c4b95ceaa1535b669ca428a0308
- filename: packages/backend/src/_portail-admin/portail-admin-login/portail-admin-login.controller.spec.ts
checksum: 3bd78f8919cbe14a45484825d6ce816bc7e2a0456fc53b9beeb1fedb6bdb061a
- filename: packages/backend/src/_tests/_core/constants/TESTS_USERS_STRUCTURE.mock.ts
Expand Down
Binary file modified _scripts/db/dumps/domifa_test.postgres.custom.gz
View file
Open in desktop
Binary file not shown.
6 changes: 0 additions & 6 deletions _scripts/db/dumps/domifa_test.postgres.restore-data-only.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,12 +130,6 @@ COPY public.monitor_batch_process (uuid, "createdAt", "updatedAt", version, "pro
--

COPY public.open_data_places (uuid, "createdAt", "updatedAt", version, nom, adresse, "complementAdresse", ville, "codePostal", departement, region, latitude, longitude, source, "uniqueId", software, mail, "structureType", "domifaStructureId", "soliguideStructureId") FROM stdin;
2e311da7-5acf-4c4b-844a-49fe237ff60b 2023-12-13 20:22:43.289737+01 2023-12-13 20:22:43.289737+01 1 Structure de Test d'import rue de l import \N Nantes 44000 44 52 47.2139730 -1.5369230 domifa 4 domifa [email protected] \N 4 \N
9a53b6e9-0e58-43d0-bebd-d4f679f6aa74 2023-12-13 20:22:43.302599+01 2023-12-13 20:22:43.302599+01 1 CCAS de Test 1 rue de l ocean \N Asnieres sur seine 92600 92 11 48.9037590 2.2837460 domifa 1 domifa [email protected] \N 1 \N
ad8a4b0a-c5a1-40eb-9f92-220d1e9c548f 2023-12-13 20:22:43.307155+01 2023-12-13 20:22:43.307155+01 1 CCAS de Cayenne 24 avenue louis pasteur \N Cayenne 97300 973 03 4.9434540 -52.3244580 domifa 5 domifa [email protected] \N 5 \N
bb9949ec-206d-4ad6-88a4-1309dec2f2a0 2023-12-13 20:22:43.310765+01 2023-12-13 20:22:43.310765+01 1 Organisme agréé de Test 1 rue du test de l organise agree \N Nantes 44000 44 52 47.2181930 -1.5613680 domifa 3 domifa [email protected] \N 3 \N
3f1db6bf-14d0-48a0-903e-bec13998480d 2023-12-13 20:22:43.313864+01 2023-12-13 20:22:43.313864+01 1 CIAS de Test 2 rue du test \N Pessac 33600 33 75 44.8176020 -0.6129570 domifa 2 domifa [email protected] \N 2 \N
af7254b8-78c7-4760-a821-f8e20b996628 2023-12-13 20:22:44.125163+01 2023-12-13 20:22:44.125163+01 1 ESI La maison du partage 32 rue bouret 75019 paris \N Paris 75019 75 11 48.8817267 2.3742211 soliguide 0 other [email protected] \N \N 0
\.


Expand Down
6 changes: 0 additions & 6 deletions _scripts/db/dumps/domifa_test.postgres.truncate-restore-data-only.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,12 +156,6 @@ COPY public.monitor_batch_process (uuid, "createdAt", "updatedAt", version, "pro
--

COPY public.open_data_places (uuid, "createdAt", "updatedAt", version, nom, adresse, "complementAdresse", ville, "codePostal", departement, region, latitude, longitude, source, "uniqueId", software, mail, "structureType", "domifaStructureId", "soliguideStructureId") FROM stdin;
2e311da7-5acf-4c4b-844a-49fe237ff60b 2023-12-13 20:22:43.289737+01 2023-12-13 20:22:43.289737+01 1 Structure de Test d'import rue de l import \N Nantes 44000 44 52 47.2139730 -1.5369230 domifa 4 domifa [email protected] \N 4 \N
9a53b6e9-0e58-43d0-bebd-d4f679f6aa74 2023-12-13 20:22:43.302599+01 2023-12-13 20:22:43.302599+01 1 CCAS de Test 1 rue de l ocean \N Asnieres sur seine 92600 92 11 48.9037590 2.2837460 domifa 1 domifa [email protected] \N 1 \N
ad8a4b0a-c5a1-40eb-9f92-220d1e9c548f 2023-12-13 20:22:43.307155+01 2023-12-13 20:22:43.307155+01 1 CCAS de Cayenne 24 avenue louis pasteur \N Cayenne 97300 973 03 4.9434540 -52.3244580 domifa 5 domifa [email protected] \N 5 \N
bb9949ec-206d-4ad6-88a4-1309dec2f2a0 2023-12-13 20:22:43.310765+01 2023-12-13 20:22:43.310765+01 1 Organisme agréé de Test 1 rue du test de l organise agree \N Nantes 44000 44 52 47.2181930 -1.5613680 domifa 3 domifa [email protected] \N 3 \N
3f1db6bf-14d0-48a0-903e-bec13998480d 2023-12-13 20:22:43.313864+01 2023-12-13 20:22:43.313864+01 1 CIAS de Test 2 rue du test \N Pessac 33600 33 75 44.8176020 -0.6129570 domifa 2 domifa [email protected] \N 2 \N
af7254b8-78c7-4760-a821-f8e20b996628 2023-12-13 20:22:44.125163+01 2023-12-13 20:22:44.125163+01 1 ESI La maison du partage 32 rue bouret 75019 paris \N Paris 75019 75 11 48.8817267 2.3742211 soliguide 0 other [email protected] \N \N 0
\.


Expand Down
7 changes: 5 additions & 2 deletions packages/backend/src/_migrations/_init-db/1603812391580-pr-env-create-database.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,12 +174,15 @@ async function createTables(queryRunner: QueryRunner) {
"source" text NOT NULL,
"uniqueId" text NOT NULL,
software text NULL,
"structureId" int4 NULL,
mail text NULL,
"structureType" text NULL,
"domifaStructureId" int4 NULL,
"soliguideStructureId" int4 NULL,
CONSTRAINT "PK_f80b64cfb42753deacd8bf6d78d" PRIMARY KEY (uuid)
);
CREATE INDEX "IDX_0408f9f2c0defbdc5e44f467a3" ON public.open_data_places USING btree (departement);
CREATE INDEX "IDX_6e030c1cdb3fa54d0d735cdc6b" ON public.open_data_places USING btree (region);
CREATE INDEX "IDX_d10ac71fca9180b787ef468659" ON public.open_data_places USING btree ("structureId");
CREATE INDEX "IDX_7ee1e7a8d9441eb76ab7b4aa5a" ON public.open_data_places USING btree ("domifaStructureId");
CREATE INDEX "IDX_d85d3252e11effca2f6b652fde" ON public.open_data_places USING btree ("codePostal");


Expand Down
5 changes: 2 additions & 3 deletions ...xport-structure-stats/worksheet-renderer/exportStructureStatsWorksheetSection3Renderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,13 @@ function renderSection3Interactions(context: {
value: data.allVisites,
});
worksheetRendered.renderCell(i++, "c", {
value: data.visite,
value: data.visiteOut,
});
worksheetRendered.renderCell(i++, "c", {
value: data.visiteOut,
value: data.visite,
});
worksheetRendered.renderCell(i++, "c", {
value: data.loginPortail,
});

context.currentRowNumber = i;
}
2 changes: 1 addition & 1 deletion packages/backend/src/open-data-places/load-data-inclusion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const getFromDataInclusion = async (structureType: "CCAS" | "CIAS") => {
if (placeExist) {
await openDataPlaceRepository.update(
{ uuid: dataInclusionPlace.uuid },
{ structureId: placeExist.structureId }
{ domifaStructureId: placeExist.domifaStructureId }
);
}
}
Expand Down
Loading