Browse Source

dev en cours

rajah 6 months ago
parent
commit
cd94efe8c7

+ 5 - 5
src/app/composants/menu/menu.component.html

@@ -1,4 +1,4 @@
-@if (!this.logged) {
+@if (!logged) {
 
 <div class="d-flex flex-column flex-shrink-0 bg-body-tertiary" id="sidenav">
   <ul class="nav nav-pills nav-flush flex-column text-center">
@@ -9,7 +9,7 @@
 	</ul>
 </div><div #signouticon class="d-none"></div>
 
-} @else if (this.logged && (this.role === "USER")) {
+} @else if (logged && (role === "USER")) {
 
 <div class="d-flex flex-column flex-shrink-0 bg-body-tertiary" id="sidenav">
   <ul class="nav nav-pills nav-flush flex-column text-center">
@@ -28,7 +28,7 @@
 	</ul>
 </div>
 
-} @else if (this.logged && (this.role === "ORGA")) {
+} @else if (logged && (role === "ORGA")) {
 
 <div class="d-flex flex-column flex-shrink-0 bg-body-tertiary" id="sidenav">
   <ul class="nav nav-pills nav-flush flex-column text-center">
@@ -48,7 +48,7 @@
 	</ul>
 </div>
 
-} @else if (this.logged && (this.role === "ADMIN")) {
+} @else if (logged && (role === "ADMIN")) {
 
 <div class="d-flex flex-column flex-shrink-0 bg-body-tertiary" id="sidenav">
   <ul class="nav nav-pills nav-flush flex-column text-center">
@@ -73,7 +73,7 @@
 </div>
 
 }
-@if (this.logged) {
+@if (logged) {
 
 <div class="modal fade" id="modalDeconnecter" tabindex="-1" aria-labelledby="modalDeconnecterTitre" aria-hidden="false">
 	<div class="modal-dialog modal-dialog-centered" role="document">

+ 4 - 4
src/app/composants/poll-list/poll-list.component.html

@@ -16,16 +16,16 @@
   		</div>
   	</div>
     <div class="card-body"><br/>
-      @if (this.affiches > 0) {
+      @if ((affiches > 0) || (logged && (this.role === "ADMIN") && (calcules > 0))) {
       <table>
   			<tbody>
-          @for (categorie of categories; track categorie.numeroCategorie) { @if (categorie.pollable || (this.logged && (this.role === "ADMIN") && (categorie.computed))) {
+          @for (categorie of categories; track categorie.numeroCategorie) { @if (categorie.pollable || (logged && (role === "ADMIN") && categorie.computed)) {
   				<tr>
             <td class="label-nobr fs-3" style="height:30px;vertical-align:center;">
-              <i class="fa-solid fa-list-ol text-body-tertiary"></i>&nbsp;<a (click)="voteCategorie(categorie.numeroCategorie)" class="link-primary pointeur-souris text-decoration-none">{{ categorie.libelle }}</a>
+              <i class="fa-solid fa-list-ol text-body-tertiary"></i>&nbsp; @if (categorie.pollable) { <a (click)="voteCategorie(categorie.numeroCategorie)" class="link-primary pointeur-souris text-decoration-none"> {{ categorie.libelle }} </a> } @else { {{ categorie.libelle }} }
             </td>
             <td class="label-nobr" style="height:30px;vertical-align:center;">
-              @if (this.logged && (this.role === "ADMIN") && (categorie.computed)) {
+              @if (logged && (role === "ADMIN") && categorie.computed) {
               <button type="button" (click)="getDiaporama(categorie.numeroCategorie, categorie.libelle)" class="btn bg-gradient btn-primary btn-sm" style="margin-left: 48px;" i18n-tootip tooltip="Télécharger le diaporama HTML contenant les résultats de cette catégorie" placement="right" container="body"><i class="fa-solid fa-file-code"></i>&nbsp;<span i18n>Diaporama</span></button>
               }
             </td>