Skip to content

Commit

Permalink
apply lint
Browse files Browse the repository at this point in the history
  • Loading branch information
jacquesfize committed Apr 8, 2024
1 parent bfe910c commit eff0068
Show file tree
Hide file tree
Showing 24 changed files with 1,670 additions and 1,259 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -217,8 +217,8 @@
let-row="row"
maxWidth="50"
>
<span matTooltip="{{ row.date_min | date : 'dd-MM-yyyy' }}">
{{ row.date_min | date : 'dd-MM-yyyy' }}
<span matTooltip="{{ row.date_min | date: 'dd-MM-yyyy' }}">
{{ row.date_min | date: 'dd-MM-yyyy' }}
</span>
</ng-template>
</ngx-datatable-column>
Expand Down
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">&times;</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>


Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<small> {{ label }} </small>
<small>{{ label }}</small>
<ng-select
[ngClass]="class"
[items]="destinations"
Expand All @@ -11,8 +11,16 @@
[formControl]="parentFormControl"
(clear)="onClear.emit()"
>
<ng-template ng-option-tmp let-item="item" let-index="index" let-search="searchTerm">
<div matTooltip="{{ item.code }}" [attr.data-qa]="item.code">
<ng-template
ng-option-tmp
let-item="item"
let-index="index"
let-search="searchTerm"
>
<div
matTooltip="{{ item.code }}"
[attr.data-qa]="item.code"
>
<span class="pre-wrap">{{ item.label }}</span>
</div>
</ng-template>
Expand Down
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 -->
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
.card-body p {
margin-bottom: 5px;
margin-bottom: 5px;
}

Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ <h5 class="card-title mb-0">Liste des imports</h5>
'Import.Destinations' | translate | lowercase
}}"
[parentFormControl]="selectDestinationForm"
(onChange) = "resetPage()"
(onClear) = "resetPage()"
(onChange)="resetPage()"
(onClear)="resetPage()"
class="flex-fill pr-1"
></pnx-destinations>
<div class="flex-fill">
Expand Down
Loading

0 comments on commit eff0068

Please sign in to comment.