diff --git a/src/app/components/formats/edit/format-form.component.html b/src/app/components/formats/edit/format-form.component.html index b4042a8203e825f720cbfaad75bd7c9c16edfa30..7c68003ae32e9f92ad58f114232245f076ff3da6 100644 --- a/src/app/components/formats/edit/format-form.component.html +++ b/src/app/components/formats/edit/format-form.component.html @@ -30,6 +30,19 @@ </div> </div> + <div class="field"> + <label class="label required" for="fileExtension">Extension de fichier</label> + <div class="control"> + <input class="input" type="text" [value]="format.fileExtension" formControlName="fileExtension" + id="fileExtension"> + </div> + <div *ngIf="fileExtension.invalid && (fileExtension.dirty || fileExtension.touched)" class="alert alert-danger"> + <p *ngIf="fileExtension.errors['required']" class="help is-danger"> + L'extension de ficher est obligatoire. + </p> + </div> + </div> + <div class="has-text-right"> <button class="button button-gl" type="submit" [disabled]="formInvalid == true">Valider</button> </div> diff --git a/src/app/components/formats/edit/format-form.component.ts b/src/app/components/formats/edit/format-form.component.ts index 73665239d0f197242529f11b22649a127bd5d4e8..cd1a1d6d67dbb99887d6434e6e58f933e098cc05 100644 --- a/src/app/components/formats/edit/format-form.component.ts +++ b/src/app/components/formats/edit/format-form.component.ts @@ -45,6 +45,7 @@ export class FormatFormComponent implements OnInit { id: [this.format.id], name: [this.format.name, Validators.required], mapServerType: [this.format.mapServerType, Validators.required], + fileExtension: [this.format.fileExtension, Validators.required], }); } @@ -72,6 +73,10 @@ export class FormatFormComponent implements OnInit { return this.form.controls['mapServerType']; } + get fileExtension() { + return this.form.controls['fileExtension']; + } + get formInvalid() { return this.form.invalid; } diff --git a/src/app/components/formats/list/formats.component.html b/src/app/components/formats/list/formats.component.html index 21681fd61701b3a8b2360be75b1c6a71631eaed4..ff125702863e6c03ef08f1cf50fd1958f2101b5a 100644 --- a/src/app/components/formats/list/formats.component.html +++ b/src/app/components/formats/list/formats.component.html @@ -38,7 +38,23 @@ MapServer</span> </span> </div> - <div class="column is-offset-7 is-1 has-text-centered"> + <div class="column is-2"> + <span (click)="sortBy('fileExtension')" class="is-sortable"> + <span class="sort-icons"> + <span class="icon"> + <i class="fas fa-sort-up" + [ngClass]="{'icon-red': sortOptions.value === 'fileExtension' && sortOptions.order === 'desc'}"></i> + </span> + <span class="icon"> + <i class="fas fa-sort-down" + [ngClass]="{'icon-red': sortOptions.value === 'fileExtension' && sortOptions.order === 'asc'}"></i> + </span> + </span> + <span class="column-title" [ngClass]="{'active': sortOptions.value === fileExtension}">Extension de + fichier</span> + </span> + </div> + <div class="column is-offset-5 is-1 has-text-centered"> <span class="column-title">Actions</span> </div> </div> @@ -51,7 +67,10 @@ <div class="column is-2"> <span>{{ format.mapServerType}}</span> </div> - <div class="column is-offset-7 is-1 has-text-centered actions"> + <div class="column is-2"> + <span>{{ format.fileExtension}}</span> + </div> + <div class="column is-offset-5 is-1 has-text-centered actions"> <app-crud-buttons [id]="format.id" (delete)="displayDeletePopup($event)"></app-crud-buttons> </div> </div> diff --git a/src/app/models/format.model.ts b/src/app/models/format.model.ts index ebef0b2408621fcc803d6c67e724cf9c3ec13748..c1a6d058a6b523f48e88e84bd8711ff58ecfd4ff 100644 --- a/src/app/models/format.model.ts +++ b/src/app/models/format.model.ts @@ -2,6 +2,7 @@ export class Format { id?: number; name: string; mapServerType: string; + fileExtension: string; constructor(format?: IFormat) { if (format) { @@ -10,9 +11,11 @@ export class Format { } this.name = format.name; this.mapServerType = format.mapServerType; + this.fileExtension = format.fileExtension; } else { this.name = ''; this.mapServerType = ''; + this.fileExtension = ''; } } } @@ -31,4 +34,5 @@ export interface IFormat { id: number; name: string; mapServerType: string; + fileExtension: string; }