Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • web-et-numerique/factory/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client
1 result
Show changes
Commits on Source (4)
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 9975 additions and 8015 deletions
angular.json
View file @ b0a43385
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"pamn": {
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
},
"root": "",
"sourceRoot": "src",
"prefix": "app",
"i18n": {
"sourceLocale": {
"code": "fr",
"baseHref": ""
},
"locales": {
"en": {
"baseHref": "/en/",
"translation": "src/locale/messages.en.xlf"
}
}
},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"localize": true,
"allowedCommonJsDependencies": ["lodash", "leaflet.locatecontrol"],
"assets": [
"src/favicon.ico",
"src/assets",
"src/sitemap.xml",
"src/robots.txt",
"src/ngsw-worker.js",
"src/ngsw.json",
"src/manifest.webmanifest",
{
"glob": "**/*",
"input": "./node_modules/leaflet/dist/images",
"output": "assets/"
}
],
"styles": [
"src/styles.scss",
"./node_modules/leaflet/dist/leaflet.css",
"./node_modules/leaflet.locatecontrol/dist/L.Control.Locate.css"
],
"scripts": [],
"serviceWorker": true,
"ngswConfigPath": "ngsw-config.json",
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "10kb",
"maximumError": "15kb"
}
],
"serviceWorker": true,
"ngswConfigPath": "ngsw-config.json"
},
"fr": {
"localize": ["fr"]
},
"en": {
"localize": ["en"]
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "pamn:build",
"proxyConfig": "proxy.conf.json"
},
"configurations": {
"production": {
"browserTarget": "pamn:build:production"
},
"fr": {
"browserTarget": "pamn:build:fr"
},
"en": {
"browserTarget": "pamn:build:en"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "pamn:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"assets": ["src/favicon.ico", "src/assets", "src/manifest.webmanifest"],
"styles": ["src/styles.scss"],
"scripts": []
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "pamn:serve"
},
"configurations": {
"production": {
"devServerTarget": "pamn:serve:production"
}
}
}
}
},
"@gouvfr-anct/mediation-numerique": {
"projectType": "library",
"root": "projects/gouvfr-anct/mediation-numerique",
"sourceRoot": "projects/gouvfr-anct/mediation-numerique/src",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "projects/gouvfr-anct/mediation-numerique/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/gouvfr-anct/mediation-numerique/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "projects/gouvfr-anct/mediation-numerique/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-builders/jest:run",
"options": {
"configPath": "jest.config.js",
"tsConfig": "tsconfig.spec.json",
"scripts": []
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"projects/gouvfr-anct/mediation-numerique/src/**/*.ts",
"projects/gouvfr-anct/mediation-numerique/src/**/*.html"
]
}
}
}
}
},
"defaultProject": "pamn"
}
{
"$schema": "./node_modules/@angular/cli/lib/config/schema.json",
"version": 1,
"newProjectRoot": "projects",
"projects": {
"pamn": {
"projectType": "application",
"schematics": {
"@schematics/angular:component": {
"style": "scss"
}
},
"root": "",
"sourceRoot": "src",
"prefix": "app",
"i18n": {
"sourceLocale": {
"code": "fr",
"baseHref": ""
},
"locales": {
"en": {
"baseHref": "/en/",
"translation": "src/locale/messages.en.xlf"
}
}
},
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:browser",
"options": {
"outputPath": "dist/",
"index": "src/index.html",
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"localize": true,
"allowedCommonJsDependencies": [
"lodash",
"leaflet.locatecontrol"
],
"assets": [
"src/favicon.ico",
"src/assets",
"src/sitemap.xml",
"src/robots.txt",
"src/ngsw-worker.js",
"src/ngsw.json",
"src/manifest.webmanifest",
{
"glob": "**/*",
"input": "./node_modules/leaflet/dist/images",
"output": "assets/"
}
],
"styles": [
"src/styles.scss",
"./node_modules/leaflet/dist/leaflet.css",
"./node_modules/leaflet.locatecontrol/dist/L.Control.Locate.css"
],
"scripts": [],
"serviceWorker": true,
"ngswConfigPath": "ngsw-config.json",
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": true,
"outputHashing": "all",
"sourceMap": false,
"namedChunks": false,
"extractLicenses": true,
"vendorChunk": false,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "10kb",
"maximumError": "15kb"
}
],
"serviceWorker": true,
"ngswConfigPath": "ngsw-config.json"
},
"fr": {
"localize": [
"fr"
]
},
"en": {
"localize": [
"en"
]
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "pamn:build",
"proxyConfig": "proxy.conf.json"
},
"configurations": {
"production": {
"browserTarget": "pamn:build:production"
},
"fr": {
"browserTarget": "pamn:build:fr"
},
"en": {
"browserTarget": "pamn:build:en"
}
}
},
"extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "pamn:build"
}
},
"test": {
"builder": "@angular-devkit/build-angular:karma",
"options": {
"main": "src/test.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.spec.json",
"karmaConfig": "karma.conf.js",
"assets": [
"src/favicon.ico",
"src/assets",
"src/manifest.webmanifest"
],
"styles": [
"src/styles.scss"
],
"scripts": []
}
},
"e2e": {
"builder": "@angular-devkit/build-angular:protractor",
"options": {
"protractorConfig": "e2e/protractor.conf.js",
"devServerTarget": "pamn:serve"
},
"configurations": {
"production": {
"devServerTarget": "pamn:serve:production"
}
}
}
}
},
"@gouvfr-anct/mediation-numerique": {
"projectType": "library",
"root": "projects/gouvfr-anct/mediation-numerique",
"sourceRoot": "projects/gouvfr-anct/mediation-numerique/src",
"prefix": "lib",
"architect": {
"build": {
"builder": "@angular-devkit/build-angular:ng-packagr",
"options": {
"project": "projects/gouvfr-anct/mediation-numerique/ng-package.json"
},
"configurations": {
"production": {
"tsConfig": "projects/gouvfr-anct/mediation-numerique/tsconfig.lib.prod.json"
},
"development": {
"tsConfig": "projects/gouvfr-anct/mediation-numerique/tsconfig.lib.json"
}
},
"defaultConfiguration": "production"
},
"test": {
"builder": "@angular-builders/jest:run",
"options": {
"configPath": "jest.config.js",
"tsConfig": "tsconfig.spec.json",
"scripts": []
}
},
"lint": {
"builder": "@angular-eslint/builder:lint",
"options": {
"lintFilePatterns": [
"projects/gouvfr-anct/mediation-numerique/src/**/*.ts",
"projects/gouvfr-anct/mediation-numerique/src/**/*.html"
]
}
}
}
}
}
}
package-lock.json
View file @ b0a43385
This diff is collapsed.
package.json
View file @ b0a43385
......@@ -17,17 +17,17 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~13.1.1",
"@angular/animations": "^14.2.1",
"@angular/cdk": "^13.1.1",
"@angular/common": "~13.1.1",
"@angular/compiler": "~13.1.1",
"@angular/core": "~13.1.1",
"@angular/common": "^14.2.1",
"@angular/compiler": "^14.2.1",
"@angular/core": "^14.2.1",
"@angular/flex-layout": "^13.0.0-beta.38",
"@angular/forms": "~13.1.1",
"@angular/platform-browser": "~13.1.1",
"@angular/platform-browser-dynamic": "~13.1.1",
"@angular/router": "~13.1.1",
"@angular/service-worker": "~13.1.1",
"@angular/forms": "^14.2.1",
"@angular/platform-browser": "^14.2.1",
"@angular/platform-browser-dynamic": "^14.2.1",
"@angular/router": "^14.2.1",
"@angular/service-worker": "^14.2.1",
"@asymmetrik/ngx-leaflet": "^8.1.0",
"@gouvfr-anct/mediation-numerique": "^0.0.17",
"@ngx-translate/core": "^13.0.0",
......@@ -40,20 +40,20 @@
"luxon": "^1.25.0",
"ngx-toastr": "^13.2.1",
"rxjs": "~6.6.0",
"tslib": "^2.0.0",
"tslib": "^2.4.0",
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-builders/jest": "^13.0.3",
"@angular-devkit/build-angular": "^13.2.1",
"@angular-eslint/builder": "^13.2.1",
"@angular-eslint/eslint-plugin": "^13.2.1",
"@angular-eslint/eslint-plugin-template": "^13.2.1",
"@angular-eslint/schematics": "^13.2.1",
"@angular-eslint/template-parser": "^13.2.1",
"@angular/cli": "^13.1.2",
"@angular/compiler-cli": "~13.1.1",
"@angular/localize": "^13.1.1",
"@angular-builders/jest": "^14.0.0",
"@angular-devkit/build-angular": "^14.2.2",
"@angular-eslint/builder": "^14.0.0-alpha.4",
"@angular-eslint/eslint-plugin": "^14.0.0-alpha.4",
"@angular-eslint/eslint-plugin-template": "^14.0.0-alpha.4",
"@angular-eslint/schematics": "^14.0.0-alpha.4",
"@angular-eslint/template-parser": "^14.0.0-alpha.4",
"@angular/cli": "^14.2.2",
"@angular/compiler-cli": "^14.2.1",
"@angular/localize": "^14.2.1",
"@compodoc/compodoc": "^1.1.16",
"@types/jasmine": "~4.0.0",
"@types/jasminewd2": "~2.0.3",
......@@ -61,29 +61,29 @@
"@types/leaflet": "^1.5.17",
"@types/leaflet.locatecontrol": "^0.60.7",
"@types/node": "^16.0.0",
"@typescript-eslint/eslint-plugin": "^5.24.0",
"@typescript-eslint/parser": "^5.24.0",
"@typescript-eslint/eslint-plugin": "^5.36.2",
"@typescript-eslint/parser": "^5.36.2",
"codelyzer": "^6.0.0",
"eslint": "^8.15.0",
"eslint": "^8.23.0",
"eslint-plugin-jest": "^26.2.2",
"http-server": "^14.1.0",
"jasmine-core": "~4.1.0",
"jasmine-spec-reporter": "~5.0.0",
"jest": "^27.5.1",
"jest-preset-angular": "^11.1.2",
"karma": "^6.3.9",
"karma": "^6.4.0",
"karma-browserify": "^7.0.0",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.5.0",
"ng-packagr": "^13.0.0",
"ng-packagr": "^14.2.1",
"prettier": "^2.1.2",
"protractor": "~7.0.0",
"standard-version": "^9.3.2",
"ts-jest": "^27.1.4",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"typescript": "~4.5.4"
"typescript": "~4.8.3"
}
}
src/app/admin/components/manage-employers/manage-employers.component.ts
View file @ b0a43385
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { Employer } from '../../../models/employer.model';
import { NotificationService } from '../../../services/notification.service';
import { AdminService } from '../../services/admin.service';
......@@ -14,7 +14,7 @@ import { ValidateEmployerComponent } from './validate-employer/validate-employer
styleUrls: ['./manage-employers.component.scss'],
})
export class ManageEmployersComponent implements OnInit {
public newEmployerForm: FormGroup;
public newEmployerForm: UntypedFormGroup;
public validatedEmployers: Employer[] = [];
public unvalidatedEmployers: Employer[] = [];
public deleteModalOpenned = false;
......@@ -51,7 +51,7 @@ export class ManageEmployersComponent implements OnInit {
constructor(
private adminService: AdminService,
private notificationService: NotificationService,
private formBuilder: FormBuilder
private formBuilder: UntypedFormBuilder
) {
this.findValidatedEmployers();
this.findUnvalidatedEmployers();
......
src/app/admin/components/manage-jobs/manage-jobs.component.ts
View file @ b0a43385
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { ValueGetterParams } from 'ag-grid-community';
import { Job } from '../../../models/job.model';
import { NotificationService } from '../../../services/notification.service';
......@@ -16,7 +16,7 @@ import { ValidateJobComponent } from './validate-job/validate-job.component';
styleUrls: ['./manage-jobs.component.scss'],
})
export class ManageJobsComponent implements OnInit {
public newJobForm: FormGroup;
public newJobForm: UntypedFormGroup;
public validatedJobs: Job[] = [];
public unvalidatedJobs: Job[] = [];
public deleteModalOpenned = false;
......@@ -54,7 +54,7 @@ export class ManageJobsComponent implements OnInit {
constructor(
private adminService: AdminService,
private notificationService: NotificationService,
private formBuilder: FormBuilder
private formBuilder: UntypedFormBuilder
) {
this.findValidatedJobs();
this.findUnvalidatedJobs();
......
src/app/contact/contact.component.ts
View file @ b0a43385
import { Component, OnInit } from '@angular/core';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { UntypedFormBuilder, UntypedFormGroup, Validators } from '@angular/forms';
import { Router } from '@angular/router';
import { Meta } from '@angular/platform-browser';
import { ContactMessage } from '../models/contact-message.model';
......@@ -15,11 +15,11 @@ import { Utils } from '../utils/utils';
styleUrls: ['./contact.component.scss'],
})
export class ContactComponent implements OnInit {
public contactForm: FormGroup;
public contactForm: UntypedFormGroup;
public loading = false;
constructor(
private formBuilder: FormBuilder,
private formBuilder: UntypedFormBuilder,
private contactService: ContactService,
private router: Router,
private authService: AuthService,
......
src/app/form/footer-form/footer-form.component.ts
View file @ b0a43385
import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { Router } from '@angular/router';
import { ButtonType } from '@gouvfr-anct/mediation-numerique/shared';
import { User } from '../../models/user.model';
......@@ -25,7 +25,7 @@ export class FooterFormComponent implements OnChanges {
@Input() isAccountMode: boolean;
@Input() btnName: string[];
@Input() nbPagesForm: number;
@Input() form: FormGroup;
@Input() form: UntypedFormGroup;
@Input() linkedStructureId: Array<string> = null;
@Input() acceptNewsletter: boolean;
@Input() currentStep: accountFormStep | profileFormStep | structureFormStep | personalOfferFormStep;
......
src/app/form/form-view/account-form/account-credentials/account-credentials.component.ts
View file @ b0a43385
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { User } from '../../../../models/user.model';
import { CustomRegExp } from '../../../../utils/CustomRegExp';
......@@ -9,7 +9,7 @@ import { CustomRegExp } from '../../../../utils/CustomRegExp';
styleUrls: ['./account-credentials.component.scss'],
})
export class AccountCredentialsComponent {
@Input() accountForm: FormGroup;
@Input() accountForm: UntypedFormGroup;
@Input() isAccountMode: boolean;
@Input() profile: User;
@Output() validateForm = new EventEmitter<any>();
......
src/app/form/form-view/account-form/account-form.component.ts
View file @ b0a43385
import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { User } from '../../../models/user.model';
import { ProfileService } from '../../../profile/services/profile.service';
......@@ -13,7 +13,7 @@ import { accountFormStep } from './accountFormStep.enum';
export class AccountFormComponent implements OnChanges {
@Input() nbSteps: number;
@Input() currentStep: accountFormStep;
@Input() accountForm: FormGroup;
@Input() accountForm: UntypedFormGroup;
public isClaimMode = false;
public isAccountMode = false;
public pagesValidation = [];
......
src/app/form/form-view/account-form/account-info/account-info.component.ts
View file @ b0a43385
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { User } from '../../../../models/user.model';
import { Utils } from '../../../../utils/utils';
......@@ -8,7 +8,7 @@ import { Utils } from '../../../../utils/utils';
templateUrl: './account-info.component.html',
})
export class AccountInfoComponent {
@Input() accountForm: FormGroup;
@Input() accountForm: UntypedFormGroup;
@Input() isClaimMode: boolean;
@Input() profile: User;
......
src/app/form/form-view/account-form/account-newsletter/account-newsletter.component.ts
View file @ b0a43385
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { User } from '../../../../models/user.model';
@Component({
......@@ -7,7 +7,7 @@ import { User } from '../../../../models/user.model';
templateUrl: './account-newsletter.component.html',
})
export class AccountNewsletterComponent {
@Input() accountForm: FormGroup;
@Input() accountForm: UntypedFormGroup;
@Input() profile: User;
@Output() acceptNewsletter = new EventEmitter<any>();
public userAcceptNewsletter: boolean = false;
......
src/app/form/form-view/form-view.component.ts
View file @ b0a43385
import { Component, OnInit } from '@angular/core';
import { FormControl, FormGroup, Validators } from '@angular/forms';
import { UntypedFormControl, UntypedFormGroup, Validators } from '@angular/forms';
import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
import { PersonalOffer, Structure } from '@gouvfr-anct/mediation-numerique';
import { forkJoin, of } from 'rxjs';
......@@ -31,24 +31,24 @@ export class FormViewComponent implements OnInit {
public formType = formType;
public currentPage: stepType;
public currentFormType: formType;
public currentForm: FormGroup;
public currentForm: UntypedFormGroup;
public formUtils = new formUtils();
// Account Form
public accountForm: FormGroup;
public accountForm: UntypedFormGroup;
public userAcceptNewsletter: boolean;
// Profile Form
public profileForm: FormGroup;
public profileForm: UntypedFormGroup;
public isPersonalOfferProfile: boolean;
// Structure from
public structureForm: FormGroup;
public editForm: FormGroup;
public structureForm: UntypedFormGroup;
public editForm: UntypedFormGroup;
public structure: Structure;
public isEditMode: boolean = false;
public structureFormStep = structureFormStep;
// Personal Offers Form
public personalOfferForm: FormGroup;
public personalOfferForm: UntypedFormGroup;
public hasOtherPersonalOffer: boolean = false;
// Page and progress var
......@@ -70,7 +70,7 @@ export class FormViewComponent implements OnInit {
public linkedStructureId;
public structureWithOwners: StructureWithOwners;
public isPageValid: boolean = false;
public hoursForm: FormGroup;
public hoursForm: UntypedFormGroup;
constructor(
private router: Router,
......@@ -168,39 +168,39 @@ export class FormViewComponent implements OnInit {
}
}
public updateHours(form: FormGroup): void {
public updateHours(form: UntypedFormGroup): void {
this.hoursForm = form;
}
private createAccountForm(email?: string): void {
this.accountForm = new FormGroup(
this.accountForm = new UntypedFormGroup(
{
email: new FormControl(email ? email : '', [Validators.required, Validators.pattern(CustomRegExp.EMAIL)]),
name: new FormControl('', [Validators.required, Validators.pattern(CustomRegExp.TEXT_WITHOUT_NUMBER)]),
surname: new FormControl('', [Validators.required, Validators.pattern(CustomRegExp.TEXT_WITHOUT_NUMBER)]),
phone: new FormControl('', [Validators.required, Validators.pattern(CustomRegExp.PHONE)]),
password: new FormControl('', [
email: new UntypedFormControl(email ? email : '', [Validators.required, Validators.pattern(CustomRegExp.EMAIL)]),
name: new UntypedFormControl('', [Validators.required, Validators.pattern(CustomRegExp.TEXT_WITHOUT_NUMBER)]),
surname: new UntypedFormControl('', [Validators.required, Validators.pattern(CustomRegExp.TEXT_WITHOUT_NUMBER)]),
phone: new UntypedFormControl('', [Validators.required, Validators.pattern(CustomRegExp.PHONE)]),
password: new UntypedFormControl('', [
Validators.required,
Validators.pattern(CustomRegExp.PASSWORD), //NOSONAR
]),
confirmPassword: new FormControl(''),
confirmPassword: new UntypedFormControl(''),
},
[MustMatch('password', 'confirmPassword')]
);
}
private createProfileForm(): void {
this.profileForm = new FormGroup({
employer: new FormGroup({
name: new FormControl('', [Validators.required]),
validated: new FormControl(false, [Validators.required]),
this.profileForm = new UntypedFormGroup({
employer: new UntypedFormGroup({
name: new UntypedFormControl('', [Validators.required]),
validated: new UntypedFormControl(false, [Validators.required]),
}),
job: new FormGroup({
name: new FormControl('', [Validators.required]),
validated: new FormControl(true, [Validators.required]),
hasPersonalOffer: new FormControl(true, [Validators.required]),
job: new UntypedFormGroup({
name: new UntypedFormControl('', [Validators.required]),
validated: new UntypedFormControl(true, [Validators.required]),
hasPersonalOffer: new UntypedFormControl(true, [Validators.required]),
}),
structure: new FormControl('', [Validators.required]),
structure: new UntypedFormControl('', [Validators.required]),
});
}
......@@ -209,14 +209,14 @@ export class FormViewComponent implements OnInit {
}
private createPersonalOfferForm(personalOffer: PersonalOffer): void {
this.personalOfferForm = new FormGroup({
publicsAccompaniment: new FormControl(personalOffer.publicsAccompaniment),
proceduresAccompaniment: new FormControl(personalOffer.proceduresAccompaniment),
baseSkills: new FormControl(personalOffer.baseSkills),
accessRight: new FormControl(personalOffer.accessRight),
digitalCultureSecurity: new FormControl(personalOffer.digitalCultureSecurity),
socialAndProfessional: new FormControl(personalOffer.socialAndProfessional),
parentingHelp: new FormControl(personalOffer.parentingHelp),
this.personalOfferForm = new UntypedFormGroup({
publicsAccompaniment: new UntypedFormControl(personalOffer.publicsAccompaniment),
proceduresAccompaniment: new UntypedFormControl(personalOffer.proceduresAccompaniment),
baseSkills: new UntypedFormControl(personalOffer.baseSkills),
accessRight: new UntypedFormControl(personalOffer.accessRight),
digitalCultureSecurity: new UntypedFormControl(personalOffer.digitalCultureSecurity),
socialAndProfessional: new UntypedFormControl(personalOffer.socialAndProfessional),
parentingHelp: new UntypedFormControl(personalOffer.parentingHelp),
});
}
......
src/app/form/form-view/personal-offer-form/personal-offer-accompaniment/personal-offer-accompaniment.component.ts
View file @ b0a43385
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { Category, Module } from '@gouvfr-anct/mediation-numerique';
import { ButtonType } from '@gouvfr-anct/mediation-numerique/shared';
import { SearchService } from '../../../../structure-list/services/search.service';
......@@ -11,7 +11,7 @@ import { SearchService } from '../../../../structure-list/services/search.servic
})
export class PersonalOfferAccompanimentComponent implements OnInit {
@Input() structureName: string;
@Input() personalOfferForm: FormGroup;
@Input() personalOfferForm: UntypedFormGroup;
@Output() validateForm = new EventEmitter<any>();
public buttonTypeEnum = ButtonType;
......
src/app/form/form-view/personal-offer-form/personal-offer-form.component.ts
View file @ b0a43385
import { Component, EventEmitter, Input, Output, SimpleChanges } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { Router } from '@angular/router';
import { formType } from '../formType.enum';
import { personalOfferFormStep } from './personalOfferFormStep.enum';
......@@ -11,7 +11,7 @@ import { personalOfferFormStep } from './personalOfferFormStep.enum';
export class PersonalOfferFormComponent {
@Input() nbSteps: number;
@Input() currentStep: personalOfferFormStep;
@Input() personalOfferForm: FormGroup;
@Input() personalOfferForm: UntypedFormGroup;
@Input() structureName: string;
@Output() setHasOtherOffer = new EventEmitter<boolean>();
@Output() pageValid = new EventEmitter<any>();
......
src/app/form/form-view/personal-offer-form/personal-offer-other-structure-choice/personal-offer-other-structure-choice.component.ts
View file @ b0a43385
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
@Component({
selector: 'app-personal-offer-other-structure-choice',
......@@ -7,7 +7,7 @@ import { FormGroup } from '@angular/forms';
})
export class PersonalOfferOtherStructureChoiceComponent {
@Input() structureName: string;
@Input() personalOfferForm: FormGroup;
@Input() personalOfferForm: UntypedFormGroup;
@Output() setOtherOffer = new EventEmitter<boolean>();
@Output() pageValid = new EventEmitter<any>();
......
src/app/form/form-view/personal-offer-form/personal-offer-training-type/personal-offer-training-type.component.ts
View file @ b0a43385
import { Component, Input } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { Category } from '@gouvfr-anct/mediation-numerique';
@Component({
......@@ -8,7 +8,7 @@ import { Category } from '@gouvfr-anct/mediation-numerique';
})
export class PersonalOfferTrainingTypeComponent {
@Input() structureName: string;
@Input() personalOfferForm: FormGroup;
@Input() personalOfferForm: UntypedFormGroup;
public setTrainingsFromCategories(categories: Category[]) {
for (const categorie of categories) {
......
src/app/form/form-view/profile-form/profile-employer-selection/profile-employer-selection.component.ts
View file @ b0a43385
import { Component, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { ButtonType } from '@gouvfr-anct/mediation-numerique/shared';
import { Employer } from '../../../../models/employer.model';
import { ProfileService } from '../../../../profile/services/profile.service';
......@@ -10,7 +10,7 @@ import { ProfileService } from '../../../../profile/services/profile.service';
styleUrls: ['./profile-employer-selection.component.scss'],
})
export class ProfileEmployerSelectionComponent {
@Input() profileForm: FormGroup;
@Input() profileForm: UntypedFormGroup;
@Output() validateForm = new EventEmitter<Employer>();
@ViewChild('searchEmployer', { static: true }) searchEmployer: ElementRef;
public buttonTypeEnum = ButtonType;
......
src/app/form/form-view/profile-form/profile-form.component.ts
View file @ b0a43385
import { Component, EventEmitter, Input, Output } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { formType } from '../formType.enum';
import { profileFormStep } from './profileFormStep.enum';
......@@ -8,7 +8,7 @@ import { profileFormStep } from './profileFormStep.enum';
templateUrl: './profile-form.component.html',
})
export class ProfileFormComponent {
@Input() profileForm: FormGroup;
@Input() profileForm: UntypedFormGroup;
@Input() nbSteps: number;
@Input() currentStep: profileFormStep;
@Output() pageValid = new EventEmitter<any>();
......
src/app/form/form-view/profile-form/profile-job-selection/profile-job-selection.component.ts
View file @ b0a43385
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { ButtonType } from '@gouvfr-anct/mediation-numerique/shared';
import { Job } from '../../../../models/job.model';
import { ProfileService } from '../../../../profile/services/profile.service';
......@@ -10,7 +10,7 @@ import { ProfileService } from '../../../../profile/services/profile.service';
styleUrls: ['./profile-job-selection.component.scss'],
})
export class ProfileJobSelectionComponent implements OnInit {
@Input() profileForm: FormGroup;
@Input() profileForm: UntypedFormGroup;
@Output() validateForm = new EventEmitter<Job>();
public jobs: Job[];
public selectedJob: Job;
......
src/app/form/form-view/profile-form/profile-structure-choice/profile-structure-choice.component.ts
View file @ b0a43385
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { FormGroup } from '@angular/forms';
import { UntypedFormGroup } from '@angular/forms';
import { Filter, Structure } from '@gouvfr-anct/mediation-numerique';
import { ButtonType } from '@gouvfr-anct/mediation-numerique/shared';
import { ProfileService } from '../../../../profile/services/profile.service';
......@@ -11,7 +11,7 @@ import { StructureService } from '../../../../services/structure.service';
styleUrls: ['./profile-structure-choice.component.scss'],
})
export class ProfileStructureChoiceComponent implements OnInit {
@Input() structureForm: FormGroup;
@Input() structureForm: UntypedFormGroup;
@Output() validateForm = new EventEmitter<Structure>();
@Output() selectedStructure: EventEmitter<Structure> = new EventEmitter<Structure>();
@Output() createStructure = new EventEmitter<string>();
......