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 (2)
...@@ -2,6 +2,13 @@ ...@@ -2,6 +2,13 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
### [1.17.3](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.17.2...v1.17.3) (2022-05-31)
### Bug Fixes
* **carto:** lockdown display handling ([b500721](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/commit/b500721b851d81796719fec312d52ae5723bbf6a))
### [1.17.2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.17.1...v1.17.2) (2022-05-30) ### [1.17.2](https://forge.grandlyon.com/web-et-numerique/pamn_plateforme-des-acteurs-de-la-mediation-numerique/pamn_client/compare/v1.17.1...v1.17.2) (2022-05-30)
......
{ {
"name": "pamn", "name": "pamn",
"version": "1.17.2", "version": "1.17.3",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
......
{ {
"name": "pamn", "name": "pamn",
"version": "1.17.2", "version": "1.17.3",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve --configuration=fr --proxy-config proxy.conf.json", "start": "ng serve --configuration=fr --proxy-config proxy.conf.json",
......
...@@ -159,7 +159,7 @@ ...@@ -159,7 +159,7 @@
</a> </a>
</div> </div>
<div class="description">{{ structure.description }}</div> <div class="description">{{ structure.description }}</div>
<div class="info"> <div class="info" *ngIf="lockdownInfoDisplay">
{{ structure.lockdownActivity }} {{ structure.lockdownActivity }}
</div> </div>
</div> </div>
......
import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
import { Structure } from '../../../models/structure.model';
import { Module } from '../../models/module.model';
import { Category } from '../../models/category.model';
import { AccessModality } from '../../enum/access-modality.enum';
import { SearchService } from '../../services/search.service';
import * as _ from 'lodash';
import { ActivatedRoute, Router } from '@angular/router'; import { ActivatedRoute, Router } from '@angular/router';
import { PrintService } from '../../../shared/service/print.service'; import * as _ from 'lodash';
import { Equipment } from '../../enum/equipment.enum'; import { ParametersService } from '../../../admin/services/parameters.service';
import { StructureService } from '../../../services/structure.service'; import { Owner } from '../../../models/owner.model';
import { TclService } from '../../../services/tcl.service'; import { Structure } from '../../../models/structure.model';
import { TclStopPoint } from '../../../models/tclStopPoint.model'; import { TclStopPoint } from '../../../models/tclStopPoint.model';
import { ProfileService } from '../../../profile/services/profile.service';
import { User } from '../../../models/user.model'; import { User } from '../../../models/user.model';
import { ProfileService } from '../../../profile/services/profile.service';
import { AuthService } from '../../../services/auth.service'; import { AuthService } from '../../../services/auth.service';
import { StructureService } from '../../../services/structure.service';
import { TclService } from '../../../services/tcl.service';
import { PrintService } from '../../../shared/service/print.service';
import { AccessModality } from '../../enum/access-modality.enum';
import { Equipment } from '../../enum/equipment.enum';
import { PublicCategorie } from '../../enum/public.enum'; import { PublicCategorie } from '../../enum/public.enum';
import { Owner } from '../../../models/owner.model'; import { Category } from '../../models/category.model';
import { Module } from '../../models/module.model';
import { SearchService } from '../../services/search.service';
@Component({ @Component({
selector: 'app-structure-details', selector: 'app-structure-details',
templateUrl: './structure-details.component.html', templateUrl: './structure-details.component.html',
...@@ -40,6 +41,7 @@ export class StructureDetailsComponent implements OnInit { ...@@ -40,6 +41,7 @@ export class StructureDetailsComponent implements OnInit {
public printMode = false; public printMode = false;
public isClaimed: boolean = null; public isClaimed: boolean = null;
public isLoading: boolean = false; public isLoading: boolean = false;
public lockdownInfoDisplay = false;
public currentProfile: User = null; public currentProfile: User = null;
public deleteModalOpenned = false; public deleteModalOpenned = false;
public claimModalOpenned = false; public claimModalOpenned = false;
...@@ -54,6 +56,7 @@ export class StructureDetailsComponent implements OnInit { ...@@ -54,6 +56,7 @@ export class StructureDetailsComponent implements OnInit {
private tclService: TclService, private tclService: TclService,
private profileService: ProfileService, private profileService: ProfileService,
private authService: AuthService, private authService: AuthService,
private parametersService: ParametersService,
private route: ActivatedRoute, private route: ActivatedRoute,
private router: Router private router: Router
) { ) {
...@@ -76,6 +79,9 @@ export class StructureDetailsComponent implements OnInit { ...@@ -76,6 +79,9 @@ export class StructureDetailsComponent implements OnInit {
}); });
} }
} }
this.parametersService.getParameters().subscribe((params) => {
this.lockdownInfoDisplay = params.lockdownInfoDisplay;
});
this.isClaimed = await this.structureService.isClaimed(this.structure._id, this.currentProfile).toPromise(); this.isClaimed = await this.structureService.isClaimed(this.structure._id, this.currentProfile).toPromise();
// GetTclStopPoints // GetTclStopPoints
......