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

Correction du problème sur le dénombrement #3139 #3251

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Correction du problème sur le dénombrement #3139 #3251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions contrib/occtax/frontend/app/occtax-form/occtax-form.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,17 +122,16 @@ export class OcctaxFormService {
}

addOccurrenceData(occurrence): void {
let occtaxData = this.occtaxData.getValue();
const occtaxData = this.occtaxData.getValue();

if (!occtaxData.releve.properties.t_occurrences_occtax) {
occtaxData.releve.properties.t_occurrences_occtax = [];
}
occtaxData.releve.properties.t_occurrences_occtax.push(occurrence);
this.occtaxData.next(occtaxData);
}

removeOccurrenceData(id_occurrence): void {
let occtaxData = this.occtaxData.getValue();
const occtaxData = this.occtaxData.getValue();
if (occtaxData.releve.properties.t_occurrences_occtax) {
for (let i = 0; i < occtaxData.releve.properties.t_occurrences_occtax.length; i++) {
if (
Expand All @@ -144,7 +143,6 @@ export class OcctaxFormService {
}
}
}
this.occtaxData.next(occtaxData);
}

replaceOccurrenceData(occurrence): void {
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/GN2CommonModule/form/dynamic-form/dynamic-form.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
'number',
'file',
'medias',
'bool_radio'
'bool_radio',
].includes(formDefComp['type_widget'])
"
>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/app/shared/discussionCardModule/discussion-card.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
color: ['0', '6'].includes(comment.cd_nomenclature) ? 'darkslategray' : 'white',
border: ['0', '6'].includes(comment.cd_nomenclature)
? '1px solid rgba(0,0,0,0.2)'
: 'none'
: 'none',
}"
>
{{ comment.label_default }}
Expand Down
2 changes: 1 addition & 1 deletion ...nd/src/app/shared/syntheseSharedModule/synthese-info-obs/synthese-info-obs.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
aria-label="Close"
(click)="activeModal.dismiss('Cross click')"
[ngStyle]="{
outlineWidth: '0px'
outlineWidth: '0px',
}"
data-qa="synthese-info-obs-close-btn"
>
Expand Down
Loading