Skip to content

Commit

Permalink
push new format ddg extract
Browse files Browse the repository at this point in the history
  • Loading branch information
MrJimmyChevallier committed Feb 21, 2025
1 parent 5ccf617 commit 10036c4
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions front/src/app/services/excel/excel.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export class ExcelService extends MainClass {
.then(async (data) => {
this.tabs = data.data;

const viewModel = {
let viewModel = {
...this.tabs.viewModel,
fonctions: data.data.fonctions,
firstLink: {
Expand All @@ -131,6 +131,10 @@ export class ExcelService extends MainClass {
this.dateStop.getValue()
).toLocaleDateString()}`,
};
viewModel = {
...viewModel,
subtitles1: viewModel.subtitles1.slice(11),
};
fetch(
this.userService.isCa() === false
? '/assets/template4.xlsx'
Expand Down Expand Up @@ -1142,9 +1146,9 @@ export class ExcelService extends MainClass {
type: 'list',
allowBlank: true,
formulae: this.userService.isCa()
? ['"JA Social,JA Siège autres,JA Parquet"']
? ['"JA Siège autres,JA Social,JA Parquet"']
: [
'"JA Social,JA Siège autres,JA Parquet,JA JAP,JA JE,JA JI,JA JLD"',
'"JA Siège autres,JA Social,JA Parquet,JA JAP,JA JE,JA JI,JA JLD"',
],
};
}
Expand Down
Binary file modified front/src/assets/template4.xlsx
Binary file not shown.

0 comments on commit 10036c4

Please sign in to comment.