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
Select Git revision
  • 354-actualites-partage-article-via-rs-image-d-illus-a-la-place-du-logo-res-in
  • 582-modification-fiche-structure-offre-structure-vs-offre-accompagnant-numerique-ordre-des-blocs
  • 630-bo-admin-fonction-2
  • 673-fiche-structure-mise-en-forme-des-rs
  • 722-envsubst-client-side-conf
  • 723-structures-l-api-ne-prend-pas-en-compte-l-offre-des-mediateurs
  • 728-cartographie-ordre-d-affichage-de-la-liste
  • 734-actualites-menu-en-mobile
  • dev
  • feat/nginx-security
  • master
  • renovate/bluehalo-ngx-leaflet-20.x
  • renovate/chokidar-4.x
  • renovate/chromatic-com-storybook-4.x
  • renovate/devdependencies-(non-major)
  • renovate/leaflet.locatecontrol-0.x
  • renovate/major-ag-grid-monorepo
  • renovate/major-angular-cli-monorepo
  • renovate/major-angular-eslint-monorepo
  • renovate/major-angular-monorepo
  • renovate/major-angularmaterial-monorepo
  • renovate/major-storybook-monorepo
  • renovate/major-typescript-eslint-monorepo
  • renovate/ng-packagr-20.x
  • renovate/ngx-matomo-client-8.x
  • renovate/ngx-toastr-19.x
  • renovate/npm-11.x
  • wip_3.4
  • 1.1.0
  • v0.0.1
  • v0.0.2
  • v0.0.3
  • v1.1.0
  • v1.10.0
  • v1.11.0
  • v1.11.1
  • v1.12.0
  • v1.12.1
  • v1.13.0
  • v1.14.0
  • v1.15.0
  • v1.16.0
  • v1.16.1
  • v1.16.2
  • v1.16.3
  • v1.17.0
  • v1.17.1
  • v1.17.2
  • v1.17.3
  • v1.2.0
  • v1.3.0
  • v1.4.0
  • v1.5.0
  • v1.6.0
  • v1.6.1
  • v1.7.0
  • v1.8.0
  • v1.9.0
  • v1.9.1
  • v2.0.0
  • v2.0.0-beta1
  • v2.0.0-beta1.1
  • v2.0.0-beta2
  • v2.0.0-beta2.1
  • v2.0.0-beta2.2
  • v2.0.0-beta4
  • v2.0.0-beta5
  • v2.0.1
  • v2.0.2
  • v2.1.0
  • v2.1.1
  • v2.1.2
  • v2.2.0
  • v2.3.0
  • v2.3.1
  • v2.3.2
  • v2.3.3
  • v2.4.0
  • v2.4.1
  • v2.4.2
  • v2.5.0
  • v3.0.0
  • v3.0.1
  • v3.0.2
  • v3.1.0
  • v3.1.0-openshift
  • v3.2.0
  • v3.2.1
  • v3.2.2
  • v3.3.0
  • v3.3.1
  • v3.4.0
  • v3.4.1
  • v3.4.2
  • v3.4.3
  • v4.0.0
  • v4.0.1
  • v4.0.2
  • v4.1.0
  • v4.1.1
100 results

Target

Select target project
  • web-et-numerique / Factory / Resin / Client
1 result
Select Git revision
  • 354-actualites-partage-article-via-rs-image-d-illus-a-la-place-du-logo-res-in
  • 582-modification-fiche-structure-offre-structure-vs-offre-accompagnant-numerique-ordre-des-blocs
  • 630-bo-admin-fonction-2
  • 673-fiche-structure-mise-en-forme-des-rs
  • 722-envsubst-client-side-conf
  • 723-structures-l-api-ne-prend-pas-en-compte-l-offre-des-mediateurs
  • 728-cartographie-ordre-d-affichage-de-la-liste
  • 734-actualites-menu-en-mobile
  • dev
  • feat/nginx-security
  • master
  • renovate/bluehalo-ngx-leaflet-20.x
  • renovate/chokidar-4.x
  • renovate/chromatic-com-storybook-4.x
  • renovate/devdependencies-(non-major)
  • renovate/leaflet.locatecontrol-0.x
  • renovate/major-ag-grid-monorepo
  • renovate/major-angular-cli-monorepo
  • renovate/major-angular-eslint-monorepo
  • renovate/major-angular-monorepo
  • renovate/major-angularmaterial-monorepo
  • renovate/major-storybook-monorepo
  • renovate/major-typescript-eslint-monorepo
  • renovate/ng-packagr-20.x
  • renovate/ngx-matomo-client-8.x
  • renovate/ngx-toastr-19.x
  • renovate/npm-11.x
  • wip_3.4
  • 1.1.0
  • v0.0.1
  • v0.0.2
  • v0.0.3
  • v1.1.0
  • v1.10.0
  • v1.11.0
  • v1.11.1
  • v1.12.0
  • v1.12.1
  • v1.13.0
  • v1.14.0
  • v1.15.0
  • v1.16.0
  • v1.16.1
  • v1.16.2
  • v1.16.3
  • v1.17.0
  • v1.17.1
  • v1.17.2
  • v1.17.3
  • v1.2.0
  • v1.3.0
  • v1.4.0
  • v1.5.0
  • v1.6.0
  • v1.6.1
  • v1.7.0
  • v1.8.0
  • v1.9.0
  • v1.9.1
  • v2.0.0
  • v2.0.0-beta1
  • v2.0.0-beta1.1
  • v2.0.0-beta2
  • v2.0.0-beta2.1
  • v2.0.0-beta2.2
  • v2.0.0-beta4
  • v2.0.0-beta5
  • v2.0.1
  • v2.0.2
  • v2.1.0
  • v2.1.1
  • v2.1.2
  • v2.2.0
  • v2.3.0
  • v2.3.1
  • v2.3.2
  • v2.3.3
  • v2.4.0
  • v2.4.1
  • v2.4.2
  • v2.5.0
  • v3.0.0
  • v3.0.1
  • v3.0.2
  • v3.1.0
  • v3.1.0-openshift
  • v3.2.0
  • v3.2.1
  • v3.2.2
  • v3.3.0
  • v3.3.1
  • v3.4.0
  • v3.4.1
  • v3.4.2
  • v3.4.3
  • v4.0.0
  • v4.0.1
  • v4.0.2
  • v4.1.0
  • v4.1.1
100 results
Show changes

Commits on Source 11

51 files
+ 1149
170
Compare changes
  • Side-by-side
  • Inline

Files

Original line number Diff line number Diff line
@@ -10,6 +10,7 @@
      [userList]="userList"
      [totalUserResult]="totalUserResult"
      [isLogged]="true"
      [filterActive]="filterActive"
      (resetEvent)="shouldResetFilters()"
      (showMoreEvent)="showMore($event)"
    ></app-result-list>
Original line number Diff line number Diff line
@@ -16,12 +16,18 @@ export class AnnuaireComponent implements OnInit {
  public totalUserResult: number;
  public resetFilters: number = 0;
  public nextPage: number = 1;
  public filterActive: boolean = false;

  ngOnInit(): void {
    this.getUsers({ queryParam: '', page: 1, jobFilters: [], employerFilter: [] });
  }
  public getUsers(params: SearchQuery): void {
    if (this.userIsLoggedIn()) {
      if (params.employerFilter?.length || params.jobFilters.length) {
        this.filterActive = true;
      } else {
        this.filterActive = false;
      }
      this.searchService
        .searchUserRegistry(params.queryParam, params.page, params.jobFilters, params.employerFilter)
        .subscribe((res: SearchResults) => {
Original line number Diff line number Diff line
<div class="results notEmpty" *ngIf="isLogged && userList.length">
<div class="results notEmpty" *ngIf="isLogged && userList.length" [ngClass]="{ filterActive: filterActive }">
  <div class="userNumber">
    {{ userList.length }} <span *ngIf="showPagination"> sur {{ totalUserResult }} </span> utilisateurs trouvés
  </div>
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@
  &.notEmpty {
    //make sure it fits the correct height no matter the content lengtj and screen height
    max-height: calc(100vh - $footer-height - $header-height - $header-height - 2rem);
    &.filterActive {
      max-height: calc(100vh - $footer-height - $header-height - $header-height - 5rem);
    }
    @media #{$large-phone} {
      height: 100%;
    }
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ export class ResultListComponent implements OnInit, OnChanges {
  @Input() userList: UserAnnuary[];
  @Input() totalUserResult: number;
  @Input() isLogged: boolean;
  @Input() filterActive: boolean;
  @Output() resetEvent = new EventEmitter<any>();
  @Output() showMoreEvent = new EventEmitter<any>();
  public maxPerPage: number = 20;
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@
.content {
  display: flex;
  align-items: center;
  max-width: 980px;
  margin: 0 auto 0.5rem auto;
  margin-bottom: 0.5rem;
  input {
    @include lato-regular-13;
    @include input-search;
@@ -188,7 +187,7 @@ a {
  }
}
.filterTags {
  margin: 0.5rem 0 0 0;
  margin-top: 0.5rem;
  .title {
    margin-top: 5px;
    color: $grey-3;
Original line number Diff line number Diff line
@@ -171,9 +171,9 @@ export class SearchBarComponent implements OnInit, OnChanges {
    this.splitFilters(this.checkedFilterList);
    this.countCheckedFilters();
    this.searchEvent.emit({
      queryParam: inputTerm,
      jobFilters: this.jobFilterChecked,
      employerFilter: this.employerFilterChecked,
      queryParam: inputTerm || '',
      jobFilters: this.checkedFilterList.length ? this.jobFilterChecked : [],
      employerFilter: this.checkedFilterList.length ? this.employerFilterChecked : [],
    });
  }
}
Original line number Diff line number Diff line
@@ -9,20 +9,18 @@ import { OrientationFormComponent } from './form/orientation-form/orientation-fo
import { AdminGuard } from './guards/admin.guard';
import { AuthGuard } from './guards/auth.guard';
import { LoginGuard } from './guards/login.guard';
import { DeactivateGuard } from './guards/deactivate.guard';
import { LegalNoticeComponent } from './legal-notice/legal-notice.component';
import { LoginComponent } from './login/login.component';
import { NewsletterSubscriptionComponent } from './newsletter-subscription/newsletter-subscription.component';
import { PageComponent } from './page/page.component';
import { EditComponent } from './profile/edit/edit.component';
import { ResetEmailComponent } from './reset-email/reset-email.component';
import { ResetPasswordComponent } from './reset-password/reset-password.component';
import { StructureResolver } from './resolvers/structure.resolver';
import { PasswordFormComponent } from './shared/components';
import { StructureJoinComponent } from './structure/structure-join/structure-join.component';
import { StructureDetailsComponent } from './structure-list/components/structure-details/structure-details.component';
import { StructureListComponent } from './structure-list/structure-list.component';
import { StructureExcludeComponent } from './structure/structure-exclude/structure-exclude.component';
import { StructureJoinComponent } from './structure/structure-join/structure-join.component';

const footerOutletRoute: Route = {
  path: '',
@@ -143,12 +141,6 @@ const routes: Routes = [
        canActivate: [AuthGuard],
        loadChildren: () => import('./profile/profile.module').then((m) => m.ProfileModule),
      },
      {
        path: 'edit',
        canActivate: [AuthGuard],
        component: EditComponent,
      },
      footerOutletRoute,
      {
        path: '',
        outlet: 'left-pane',
Original line number Diff line number Diff line
@@ -17,13 +17,12 @@ import { stepType } from '../step.type';
@Component({
  selector: 'app-footer-form',
  templateUrl: './footer-form.component.html',
  styleUrls: ['./footer-form.component.scss']
  styleUrls: ['./footer-form.component.scss'],
})
export class FooterFormComponent implements OnChanges {
  @Input() currentForm: formType;
  @Input() isValid: boolean;
  @Input() isClaimMode: boolean;
  @Input() isAccountMode: boolean;
  @Input() btnName: string[];
  @Input() nbPagesForm: number;
  @Input() form: UntypedFormGroup;
@@ -74,7 +73,8 @@ export class FooterFormComponent implements OnChanges {
      }
      if (
        this.currentForm === formType.structure &&
        (this.currentStep === structureFormStep.noStructure || this.currentStep === structureFormStep.StructureInfoUnknown)
        (this.currentStep === structureFormStep.noStructure ||
          this.currentStep === structureFormStep.StructureInfoUnknown)
      ) {
        this.isLastFormStep = true;
      }
@@ -134,8 +134,11 @@ export class FooterFormComponent implements OnChanges {
      const user = new User(this.form.value);
      // Create user with structure
      user.structuresLink = this.linkedStructureId;
      this.authService.register(user).subscribe(() => {});
      this.newsletterService.newsletterSubscribe(user.email).subscribe(() => {});
      this.authService.register(user).subscribe(() => {
        if (this.acceptNewsletter) {
          this.newsletterService.newsletterSubscribe(user.email).subscribe();
        }
      });
      document.getElementsByClassName('page')[0].scrollTo(0, 0);
    }
    if (this.isProfileLastPage()) {
@@ -195,7 +198,9 @@ export class FooterFormComponent implements OnChanges {

  private isStructureChoiceValid(): boolean {
    return (
      this.currentForm === formType.structure && this.currentStep === structureFormStep.structureChoice && this.form.value._id
      this.currentForm === formType.structure &&
      this.currentStep === structureFormStep.structureChoice &&
      this.form.value._id
    );
  }

@@ -215,7 +220,8 @@ export class FooterFormComponent implements OnChanges {

  private isPersonalOfferpage(): boolean {
    return (
      this.currentForm === formType.personaloffer && this.currentStep === personalOfferFormStep.personalOfferStructureChoice
      this.currentForm === formType.personaloffer &&
      this.currentStep === personalOfferFormStep.personalOfferStructureChoice
    );
  }
  public isPersonalOfferFirstPage(): boolean {