-
Notifications
You must be signed in to change notification settings - Fork 102
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
bfe910c
commit eff0068
Showing
24 changed files
with
1,670 additions
and
1,259 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
32 changes: 18 additions & 14 deletions
32
frontend/src/app/modules/imports/components/delete-modal/delete-modal.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,31 +1,35 @@ | ||
|
||
<div class="modal-header"> | ||
<h4 class="modal-title pull-left">Suppression</h4> | ||
<button type="button" class="close pull-right" aria-label="Close" (click)="c()"> | ||
<button | ||
type="button" | ||
class="close pull-right" | ||
aria-label="Close" | ||
(click)="c()" | ||
> | ||
<span aria-hidden="true">×</span> | ||
</button> | ||
</div> | ||
<div class="modal-body"> | ||
<p> | ||
Supprimer cet import associé au JDD "{{row.dataset.dataset_name}}" et commencé le {{row.date_create_import}}? | ||
</p> | ||
<p *ngIf="row.date_end_import"> | ||
Attention : cela supprimera aussi les données importées. | ||
Supprimer cet import associé au JDD "{{ row.dataset.dataset_name }}" et commencé le | ||
{{ row.date_create_import }}? | ||
</p> | ||
<button | ||
type="button" | ||
(click)="c()" | ||
<p *ngIf="row.date_end_import">Attention : cela supprimera aussi les données importées.</p> | ||
<button | ||
type="button" | ||
(click)="c()" | ||
mat-raised-button | ||
class="mr-1" | ||
> | ||
> | ||
Annuler | ||
</button> | ||
|
||
<button type="button" | ||
<button | ||
type="button" | ||
(click)="deleteImport()" | ||
mat-raised-button | ||
color="warn" | ||
>Supprimer</button> | ||
> | ||
Supprimer | ||
</button> | ||
</div> | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
211 changes: 133 additions & 78 deletions
211
frontend/src/app/modules/imports/components/import_errors/import_errors.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,81 +1,136 @@ | ||
<div class="container"> | ||
<div class="card border-danger"> | ||
<div class="card-header bg-danger text-white text-center"> | ||
<b>Rapport d'erreur(s) </b> | ||
<div class="card border-danger"> | ||
<div class="card-header bg-danger text-white text-center"> | ||
<b>Rapport d'erreur(s)</b> | ||
</div> | ||
<div class="card-body"> | ||
<h3 class="underlined">Description de l'import</h3> | ||
<div class="row"> | ||
<div class="col-6"> | ||
<p> | ||
<b>Nom du fichier :</b> | ||
{{ importData.full_file_name }} | ||
</p> | ||
<p> | ||
<b>Jeu de données :</b> | ||
{{ importData.dataset.dataset_name }} | ||
</p> | ||
<p> | ||
<b>Date de soumission de l'import :</b> | ||
{{ importData.date_create_import | date: 'dd/MM/yyyy' }} | ||
</p> | ||
<p> | ||
<b>Auteur(s) :</b> | ||
{{ importData.authors_name }} | ||
</p> | ||
<p> | ||
<b>Nombre de lignes :</b> | ||
{{ importData.source_count }} | ||
</p> | ||
</div> | ||
<div class="card-body"> | ||
<h3 class="underlined"> | ||
Description de l'import | ||
</h3> | ||
<div class="row"> | ||
<div class="col-6"> | ||
<p> <b> Nom du fichier : </b> {{importData.full_file_name}} </p> | ||
<p> <b> Jeu de données : </b> {{importData.dataset.dataset_name}} </p> | ||
<p> <b>Date de soumission de l'import : </b> {{importData.date_create_import | date:'dd/MM/yyyy'}} </p> | ||
<p> <b>Auteur(s) : </b> {{importData.authors_name}} </p> | ||
<p> <b>Nombre de lignes : </b> {{importData.source_count}} </p> | ||
</div> | ||
<div class="col-6"> | ||
<p> <b> SRID : </b> {{importData.srid}} </p> | ||
<p><b> Encodage :</b> {{importData.encoding}} </p> | ||
<p><b> Format : </b>{{importData.format_source_file}} </p> | ||
</div> | ||
</div> | ||
<div class="col-6"> | ||
<p> | ||
<b>SRID :</b> | ||
{{ importData.srid }} | ||
</p> | ||
<p> | ||
<b>Encodage :</b> | ||
{{ importData.encoding }} | ||
</p> | ||
<p> | ||
<b>Format :</b> | ||
{{ importData.format_source_file }} | ||
</p> | ||
</div> | ||
</div> | ||
|
||
<h3 class="underlined" *ngIf="importErrors"> Erreurs</h3> | ||
<div *ngIf="importErrors; then errors"></div> | ||
<ng-template #errors> | ||
<p> La soumission comporte <b> {{importErrors.length}}</b> erreur(s) </p> | ||
<table class="table table-striped table-bordered"> | ||
<thead> | ||
<tr> | ||
<th>Type d'erreur </th> | ||
<th>Champ </th> | ||
<th>Description erreur</th> | ||
<th>Nombre d'erreur(s)</th> | ||
<th>Numéro des lignes en erreur </th> | ||
<th>{{ "Import.Report.Errors.Entity" | translate }}</th> | ||
</tr> | ||
</thead> | ||
<tbody> | ||
<tr *ngFor="let error of importErrors"> | ||
<td> {{error.type.name}} </td> | ||
<td> {{error.column}} </td> | ||
<td> {{error.type.description}} <i *ngIf="error.comment"> <br> {{error.comment}} </i> </td> | ||
<td> {{error.rows.length || ''}} </td> | ||
<td> {{error.rows.join(', ')}} </td> | ||
<td> {{error.entity ? error.entity.label : ""}} </td> | ||
</tr> | ||
</tbody> | ||
</table> | ||
</ng-template> | ||
<h3 class="underlined" *ngIf="importWarnings"> Alertes </h3> | ||
<div *ngIf="importWarnings; then warnings"></div> | ||
<ng-template #warnings> | ||
<p> La soumission comporte <b> {{importWarnings.length}}</b> alertes(s) </p> | ||
<table class="table table-striped table-bordered"> | ||
<thead> | ||
<tr> | ||
<th>Type d'alert </th> | ||
<th>Champ </th> | ||
<th>Description alert</th> | ||
<th>Nombre d'erreur(s)</th> | ||
<th>Numéro des lignes en erreur </th> | ||
<th>{{ "Import.Report.Errors.Entity" | translate }}</th> | ||
</tr> | ||
</thead> | ||
<tbody> | ||
<tr *ngFor="let warning of importWarnings"> | ||
<td> {{warning.type.name}} </td> | ||
<td> {{warning.column}} </td> | ||
<td> {{warning.type.description}} <i *ngIf="warning.comment"> <br> {{warning.comment}} </i> </td> | ||
<td> {{warning.rows.length || ''}} </td> | ||
<td> {{warning.rows.join(', ')}} </td> | ||
<td> {{error.entity ? error.entity.label : ""}} </td> | ||
</tr> | ||
</tbody> | ||
</table> | ||
</ng-template> | ||
</div><!-- end card-body --> | ||
</div><!-- end card --> | ||
</div><!-- end container --> | ||
<h3 | ||
class="underlined" | ||
*ngIf="importErrors" | ||
> | ||
Erreurs | ||
</h3> | ||
<div *ngIf="importErrors; then errors"></div> | ||
<ng-template #errors> | ||
<p> | ||
La soumission comporte | ||
<b>{{ importErrors.length }}</b> | ||
erreur(s) | ||
</p> | ||
<table class="table table-striped table-bordered"> | ||
<thead> | ||
<tr> | ||
<th>Type d'erreur</th> | ||
<th>Champ</th> | ||
<th>Description erreur</th> | ||
<th>Nombre d'erreur(s)</th> | ||
<th>Numéro des lignes en erreur</th> | ||
<th>{{ 'Import.Report.Errors.Entity' | translate }}</th> | ||
</tr> | ||
</thead> | ||
<tbody> | ||
<tr *ngFor="let error of importErrors"> | ||
<td>{{ error.type.name }}</td> | ||
<td>{{ error.column }}</td> | ||
<td> | ||
{{ error.type.description }} | ||
<i *ngIf="error.comment"> | ||
<br /> | ||
{{ error.comment }} | ||
</i> | ||
</td> | ||
<td>{{ error.rows.length || '' }}</td> | ||
<td>{{ error.rows.join(', ') }}</td> | ||
<td>{{ error.entity ? error.entity.label : '' }}</td> | ||
</tr> | ||
</tbody> | ||
</table> | ||
</ng-template> | ||
<h3 | ||
class="underlined" | ||
*ngIf="importWarnings" | ||
> | ||
Alertes | ||
</h3> | ||
<div *ngIf="importWarnings; then warnings"></div> | ||
<ng-template #warnings> | ||
<p> | ||
La soumission comporte | ||
<b>{{ importWarnings.length }}</b> | ||
alertes(s) | ||
</p> | ||
<table class="table table-striped table-bordered"> | ||
<thead> | ||
<tr> | ||
<th>Type d'alert</th> | ||
<th>Champ</th> | ||
<th>Description alert</th> | ||
<th>Nombre d'erreur(s)</th> | ||
<th>Numéro des lignes en erreur</th> | ||
<th>{{ 'Import.Report.Errors.Entity' | translate }}</th> | ||
</tr> | ||
</thead> | ||
<tbody> | ||
<tr *ngFor="let warning of importWarnings"> | ||
<td>{{ warning.type.name }}</td> | ||
<td>{{ warning.column }}</td> | ||
<td> | ||
{{ warning.type.description }} | ||
<i *ngIf="warning.comment"> | ||
<br /> | ||
{{ warning.comment }} | ||
</i> | ||
</td> | ||
<td>{{ warning.rows.length || '' }}</td> | ||
<td>{{ warning.rows.join(', ') }}</td> | ||
<td>{{ error.entity ? error.entity.label : '' }}</td> | ||
</tr> | ||
</tbody> | ||
</table> | ||
</ng-template> | ||
</div> | ||
<!-- end card-body --> | ||
</div> | ||
<!-- end card --> | ||
</div> | ||
<!-- end container --> |
3 changes: 1 addition & 2 deletions
3
frontend/src/app/modules/imports/components/import_errors/import_errors.component.scss
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,3 @@ | ||
.card-body p { | ||
margin-bottom: 5px; | ||
margin-bottom: 5px; | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.