Skip to content

Commit

Permalink
i18n accreditation (#23)
Browse files Browse the repository at this point in the history
* i18n accreditation

* remove unused import
  • Loading branch information
dtrouillet authored Feb 1, 2020
1 parent 5689424 commit 245bc15
Show file tree
Hide file tree
Showing 187 changed files with 607 additions and 598 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import {NgModule} from '@angular/core';
import {RouterModule, Routes} from '@angular/router';
import {AuthGuard} from '../core/services';
import {SynthesisAccreditationRequest} from "./synthesis-accreditation-request.component";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,22 @@
<thead>
<tr>
<th id="accReqId">
Id
{{'ACCREDITATION.ID' | translate}}
</th>
<th id="accReqApp">
Application
{{'ACCREDITATION.APPLICATION' | translate}}
</th>
<th id="accReqWantUse">
Droit Utilisation
{{'ACCREDITATION.USERIGHT' | translate}}
</th>
<th id="accReqWantManage">
Droit de gestion
{{'ACCREDITATION.MANAGERIGHT' | translate}}
</th>
<th id="accReqState">
Etat
{{'ACCREDITATION.STATE' | translate}}
</th>
<th id="actions">
Actions
{{'ACTIONS' | translate}}
</th>
</tr>
</thead>
Expand All @@ -41,8 +41,8 @@
{{accReq.state}}
</td>
<td class="text-center">
<a *ngIf="!userOnly" (click)="accept(accReq)" href="javascript:void(0)" class="btn btn-secondary btn-sm">Accepter</a>
<a *ngIf="!userOnly" (click)="reject(accReq)" href="javascript:void(0)" class="btn btn-secondary btn-sm">Rejeter</a>
<a *ngIf="!userOnly" (click)="accept(accReq)" href="javascript:void(0)" class="btn btn-secondary btn-sm">{{'ACCREDITATION.ALLOW' | translate}}</a>
<a *ngIf="!userOnly" (click)="reject(accReq)" href="javascript:void(0)" class="btn btn-secondary btn-sm">{{'ACCREDITATION.REJECT' | translate}}</a>
</td>
</tr>
</tbody>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import {Component, Input, OnInit, ViewChild} from '@angular/core';
import {AccreditationRequestsService} from '../core/services';
import {Pageable} from "../core/models/pageable.model";
import {Action, ColumnsDefinition, Table} from "../shared/table/table.model";
import {Constants} from "../shared/Constants";
import {Observable, Subject} from "rxjs";
import {AccreditationRequest} from "../core/models";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
<div class="modal-header">
<h4 class="modal-title" id="modal-basic-title">Demande d'accréditation</h4>
<h4 class="modal-title" id="modal-basic-title">{{'ACCREDITATION.REQUEST_TITLE' | translate}}</h4>
<button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<form (ngSubmit)="newForm.form.valid && sendRequest()" #newForm="ngForm">
<div class="mb-2">
<label class="form-label" for="application">Nom de l'application</label>
<label class="form-label" for="application">{{'ACCREDITATION.APPLICATION_NAME' | translate}}</label>
<input id="application" name="application" type="text" class="form-control" [class.is-invalid]="searchFailed"
[resultFormatter]="formatter" [inputFormatter]="formatter" [(ngModel)]="model" [ngbTypeahead]="search"
placeholder="nom de l'application"/>
<span *ngIf="searching">recherche en cours...</span>
<div class="invalid-feedback" *ngIf="searchFailed">Désolé, les suggestions ne peuvent être chargées.</div>
<span *ngIf="searching">{{'ACCREDITATION.LOAD_SEARCH' | translate}}</span>
<div class="invalid-feedback" *ngIf="searchFailed">{{'ACCREDITATION.SEARCH_TROUBLE' | translate}}</div>
</div>
<div class="mb-2">
<label class="form-label">Droits</label>
<label class="form-label">{{'ACCREDITATION.RIGHTS' | translate}}</label>
<div class="form-selectgroup form-selectgroup-pills mr-1">
<label class="form-selectgroup-item">
<input type="checkbox" id="wantManage" name="wantManage" [(ngModel)]="request.wantManage" class="form-selectgroup-input" checked>
<span class="form-selectgroup-box">Droit de gestion</span>
<span class="form-selectgroup-box">{{'ACCREDITATION.MANAGERIGHT' | translate}}</span>
</label>
</div>
<div class="form-selectgroup form-selectgroup-pills">
<label class="form-selectgroup-item">
<input type="checkbox" id="wantUse" name="wantUse" [(ngModel)]="request.wantUse" class="form-selectgroup-input" checked>
<span class="form-selectgroup-box">Droit de lancement</span>
<span class="form-selectgroup-box">{{'ACCREDITATION.USERIGHT' | translate}}</span>
</label>
</div>
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-outline-dark" (click)="activeModal.dismiss('cancel')">Annuler</button>
<button type="button" class="btn btn-outline-dark" (click)="newForm.form.valid && sendRequest()">Envoyer</button>
<button type="button" class="btn btn-outline-dark" (click)="activeModal.dismiss('cancel')">{{'CANCEL' | translate}}</button>
<button type="button" class="btn btn-outline-dark" (click)="newForm.form.valid && sendRequest()">{{'SUBMIT' | translate}}</button>
</div>
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import {Component, OnInit} from '@angular/core';
import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
import {FileKind} from '../../core/models/file-kind.model';
import {FileKindsService} from '../../core/services/file-kinds.service';
import {Application, CreationAccreditationRequest} from '../../core/models';
import {DatePipe} from '@angular/common';
import {AccreditationRequestsService, ApplicationsService} from "../../core/services";
import {ToastService} from "../../core/services/toast.service";
import {Observable, of} from "rxjs";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
<div class="row align-items-center">
<div class="col-auto">
<h2 class="page-pretitle">
Synthèse
{{'ACCREDITATION.SYNTHESIS' | translate}}
</h2>
<h2 id="tableTitle" class="page-title">
Demande d'accréditation
{{'ACCREDITATION.REQUEST_TITLE' | translate}}
</h2>
</div>
<!-- Page title actions -->
<div class="col-auto ml-auto d-print-none">
<div class="d-flex">
<a href="javascript:void(0)" class="btn btn-primary mr-3 cursor-pointer" (click)="requestAccreditation()">
<ebad-icon name="plus"></ebad-icon>
Nouvelle demande
{{'ACCREDITATION.NEW_REQUEST' | translate}}
</a>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {Component} from '@angular/core';
import {ModalRenameComponent} from "../files/modal-rename/modal-rename.component";
import {NgbModal} from "@ng-bootstrap/ng-bootstrap";
import {ModalRequestComponent} from "./modal-request/modal-request.component";

Expand Down
2 changes: 1 addition & 1 deletion src/app/admin-news/admin-news.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {AdminNewsRoutingModule} from './admin-news-routing.module';
import {SharedModule} from '../shared';
import {ModalNewComponent} from './modal-new/modal-new.component';
import {ModalNewDeletionComponent} from './modal-new-deletion/modal-new-deletion.component';
import { CKEditorModule } from '@ckeditor/ckeditor5-angular';
import {CKEditorModule} from '@ckeditor/ckeditor5-angular';
import {NgbPaginationModule, NgbToastModule} from "@ng-bootstrap/ng-bootstrap";
import {DataTablesModule} from "angular-datatables";

Expand Down
4 changes: 2 additions & 2 deletions src/app/admin-norms/modal-norm/modal-norm.component.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {Component, OnInit} from '@angular/core';
import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
import {Application, Norme} from '../../core/models';
import {ApplicationsService, NormsService} from '../../core/services';
import {Norme} from '../../core/models';
import {NormsService} from '../../core/services';

@Component({
selector: 'app-modal-norm',
Expand Down
3 changes: 1 addition & 2 deletions src/app/admin-users/admin-users.module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import {NgModule} from '@angular/core';
import {AdminUsersRoutingModule} from './admin-users-routing.module';
import {SharedModule} from '../shared';
import {AdminUsersComponent} from './admin-users.component';
Expand Down
2 changes: 1 addition & 1 deletion src/app/admin-users/modal-roles/modal-roles.component.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {Component, OnInit} from '@angular/core';
import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
import {Roles, User} from '../../core/models';
import {Roles} from '../../core/models';
import {UsersService} from '../../core/services';

@Component({
Expand Down
2 changes: 1 addition & 1 deletion src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {NgModule} from '@angular/core';
import {NoPreloading, PreloadAllModules, RouterModule, Routes} from '@angular/router';
import {PreloadAllModules, RouterModule, Routes} from '@angular/router';
import {HomeComponent} from "./home/home.component";
import {AuthGuard} from "./core/services";
import {NoAuthGuard} from "./auth/no-auth-guard.service";
Expand Down
6 changes: 4 additions & 2 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {GlobalSettingsService, UserService} from './core';
import {TranslateService} from "@ngx-translate/core";
import {OauthService} from "./security/oauth.service";
import {environment} from "../environments/environment";
import {ActivatedRouteSnapshot, Router} from "@angular/router";
import {Router} from "@angular/router";

@Component({
selector: 'app-root',
Expand Down Expand Up @@ -43,6 +43,8 @@ export class AppComponent implements OnInit {
if(result){
this.globalSettingsService.populateGlobalSetting();
}
}, (error) => {});
}, (error) => {
console.error(error);
});
}
}
8 changes: 4 additions & 4 deletions src/app/auth/auth-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import { AuthComponent } from './auth.component';
import { NoAuthGuard } from './no-auth-guard.service';
import {NgModule} from '@angular/core';
import {RouterModule, Routes} from '@angular/router';
import {AuthComponent} from './auth.component';
import {NoAuthGuard} from './no-auth-guard.service';

const routes: Routes = [
{
Expand Down
8 changes: 4 additions & 4 deletions src/app/auth/auth.component.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, FormControl, Validators } from '@angular/forms';
import { ActivatedRoute, Router } from '@angular/router';
import {Component, OnInit} from '@angular/core';
import {FormBuilder, FormGroup, Validators} from '@angular/forms';
import {ActivatedRoute, Router} from '@angular/router';

import {ApiService, Errors, UserService} from '../core';
import {ApiService, UserService} from '../core';
import {OauthService} from "../security/oauth.service";
import {environment} from "../../environments/environment";

Expand Down
10 changes: 5 additions & 5 deletions src/app/auth/auth.module.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { NgModule } from '@angular/core';
import {NgModule} from '@angular/core';

import { AuthComponent } from './auth.component';
import { NoAuthGuard } from './no-auth-guard.service';
import { SharedModule } from '../shared';
import { AuthRoutingModule } from './auth-routing.module';
import {AuthComponent} from './auth.component';
import {NoAuthGuard} from './no-auth-guard.service';
import {SharedModule} from '../shared';
import {AuthRoutingModule} from './auth-routing.module';

@NgModule({
imports: [
Expand Down
10 changes: 5 additions & 5 deletions src/app/auth/no-auth-guard.service.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Injectable } from '@angular/core';
import { ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot } from '@angular/router';
import { Observable } from 'rxjs';
import {Injectable} from '@angular/core';
import {ActivatedRouteSnapshot, CanActivate, Router, RouterStateSnapshot} from '@angular/router';
import {Observable} from 'rxjs';

import { UserService } from '../core';
import { map , take } from 'rxjs/operators';
import {UserService} from '../core';
import {map, take} from 'rxjs/operators';

@Injectable()
export class NoAuthGuard implements CanActivate {
Expand Down
4 changes: 2 additions & 2 deletions src/app/batchs/batchs-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import {NgModule} from '@angular/core';
import {RouterModule, Routes} from '@angular/router';
import {BatchsComponent} from './batchs.component';
import {AuthGuard} from '../core/services';

Expand Down
4 changes: 2 additions & 2 deletions src/app/batchs/batchs.module.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { NgModule } from '@angular/core';
import {NgModule} from '@angular/core';
import {BatchsComponent} from './batchs.component';
import {BatchsRoutingModule} from './batchs-routing.module';
import {SharedModule} from '../shared';
import {IconsModule} from '../icons';
import { ModalRunWithParametersComponent } from './modal-run-with-parameters/modal-run-with-parameters.component';
import {ModalRunWithParametersComponent} from './modal-run-with-parameters/modal-run-with-parameters.component';
import {NgbPaginationModule} from "@ng-bootstrap/ng-bootstrap";
import {DataTablesModule} from "angular-datatables";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Component, OnInit } from '@angular/core';
import {Component} from '@angular/core';
import {NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';

@Component({
Expand Down
4 changes: 2 additions & 2 deletions src/app/chains/chains-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { NgModule } from '@angular/core';
import { Routes, RouterModule } from '@angular/router';
import {NgModule} from '@angular/core';
import {RouterModule, Routes} from '@angular/router';
import {AuthGuard} from '../core/services';
import {ChainsComponent} from './chains.component';

Expand Down
5 changes: 2 additions & 3 deletions src/app/chains/chains.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { ChainsComponent } from './chains.component';
import {NgModule} from '@angular/core';
import {ChainsComponent} from './chains.component';
import {ChainsRoutingModule} from './chains-routing.module';
import {SharedModule} from '../shared';
import {DataTablesModule} from "angular-datatables";
Expand Down
26 changes: 18 additions & 8 deletions src/app/core/core.module.ts
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { HTTP_INTERCEPTORS } from '@angular/common/http';
import { HttpTokenInterceptor } from './interceptors';
import {NgModule} from '@angular/core';
import {CommonModule} from '@angular/common';
import {HTTP_INTERCEPTORS} from '@angular/common/http';
import {HttpTokenInterceptor} from './interceptors';

import {
AccreditationRequestsService,
ApiService,
ApplicationsService,
AuthGuard, BatchsService, ChainsService,
StatisticsService, EnvironmentsService, FilesService, GlobalSettingsService,
JwtService, NewsService, NormsService, NotificationsService,
AuthGuard,
BatchsService,
ChainsService,
EnvironmentsService,
FilesService,
GlobalSettingsService,
JwtService,
NewsService,
NormsService,
NotificationsService,
ProfilesService,
SelectChoicesService,
StatisticsService,
TagsService,
UserService, UsersService, SelectChoicesService
UserService,
UsersService
} from './services';
import {TracesService} from './services/traces.service';
import {FileKindsService} from './services/file-kinds.service';
Expand Down
7 changes: 1 addition & 6 deletions src/app/core/interceptors/http.token.interceptor.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
import {Injectable} from '@angular/core';
import {
HttpEvent,
HttpHandler,
HttpInterceptor,
HttpRequest,
} from '@angular/common/http';
import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest,} from '@angular/common/http';
import {Observable, throwError} from 'rxjs';

import {JwtService, UserService} from '../services';
Expand Down
1 change: 0 additions & 1 deletion src/app/core/models/accreditation-request.model.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import {Environment} from './environment.model';
import {Audit} from './audit.model';
import {User} from "./user.model";
import {Application} from "./application.model";
Expand Down
2 changes: 1 addition & 1 deletion src/app/core/models/article.model.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Profile } from './profile.model';
import {Profile} from './profile.model';

export interface Article {
slug: string;
Expand Down
4 changes: 1 addition & 3 deletions src/app/core/models/pageable.model.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
import {Sort} from './sort.model';

export class Pageable {
offset: number;
page: number;
size: number;
paged: boolean;
sort: string;
unpaged: boolean;



constructor(pageNumber?: number, pageSize?: number, sort?: string){
Expand Down
1 change: 0 additions & 1 deletion src/app/core/models/trace.model.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {Batch} from './batch.model';
import {Environment} from './environment.model';
import {User} from './user.model';

export interface Trace {
id: number;
Expand Down
1 change: 0 additions & 1 deletion src/app/core/models/user.model.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {Audit} from './audit.model';
import {Account} from './account.model';
import {Application} from './application.model';
import {UsageApplication} from "./usage-application.model";

export interface User extends Account, Audit {
Expand Down
5 changes: 1 addition & 4 deletions src/app/core/services/accreditation-requests.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ import {Injectable} from '@angular/core';
import {Observable} from 'rxjs';

import {ApiService} from './api.service';
import {
AccreditationRequest,
CreationAccreditationRequest, ResponseAccreditationRequest
} from '../models';
import {AccreditationRequest, CreationAccreditationRequest, ResponseAccreditationRequest} from '../models';
import {Page} from "../models/page.model";
import {Pageable} from "../models/pageable.model";

Expand Down
Loading

0 comments on commit 245bc15

Please sign in to comment.