tykayn/funky-framadate-front
1
1
Fork 1
mirror of https://framagit.org/framasoft/framadate/funky-framadate-front.git synced 2023-08-25 13:53:14 +02:00
Code Issues Projects Releases Wiki Activity

🐛 fix visibility of config in summary

Browse Source
This commit is contained in:
Baptiste Lemoine 2020-01-29 17:52:04 +01:00
parent 43ea524c26
commit f976d65d20
3 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/app/pages/voting/voting-summary/voting-summary.component.html
View File

@ -13,12 +13,23 @@
Pseudo Pseudo
</td > </td >
<td *ngFor='let choice of config.currentPoll.choices' > <td *ngFor='let choice of config.currentPoll.choices' >
<!-- {{choice.id}})-->
{{choice.text}} {{choice.text}}
</td > </td >
</tr > </tr >
<!-- somme des points, dont un demi point pour les "peut être" -->
</thead > </thead >
<tbody > <tbody >
<tr
title='somme des points, dont un demi point pour les "peut être"' >
<td >
<i class='fa fa-plus-circle' ></i > points
</td >
<td *ngFor='let k of getKeys(config.currentPoll.choices_count.counts )' >
{{ 1 * (config.currentPoll.choices_count.counts[k].yes.count) + (config.currentPoll.choices_count.counts[k].yes.count ? config.currentPoll.choices_count.counts[k].maybe.count * 0.5 : 0)}}
</td >
</tr >
<tr <tr
class='votes-of-the-person' class='votes-of-the-person'
*ngFor='let voteStack of pollconfig.stacks' *ngFor='let voteStack of pollconfig.stacks'
@ -34,5 +45,20 @@
</span > </span >
</td > </td >
</tr > </tr >
<tr class='details' >
<td >
<i class='fa fa-eye' ></i >
</td >
<td *ngFor='let k of getKeys(config.currentPoll.choices_count.counts )' >
yes {{config.currentPoll.choices_count.counts[k].yes.count}}
<br >
maybe
{{(config.currentPoll.choices_count.counts[k].yes.maybe ? config.currentPoll.choices_count.counts[k].yes.count * 0.5 : 0)}}
<br >
no {{(config.currentPoll.choices_count.counts[k].yes.maybe ? config.currentPoll.choices_count.counts[k].maybe.count * 0.5 : 0)}}
</td >
</tr >
</tbody > </tbody >
</table > </table >

2
src/app/pages/voting/voting-summary/voting-summary.component.ts
View File

@ -16,7 +16,7 @@ export class VotingSummaryComponent implements OnInit {
@Input() pollconfig = mockPoll3; @Input() pollconfig = mockPoll3;
constructor(private config: ConfigService) { constructor(public config: ConfigService) {
} }

3
src/app/ui/vote-choice/vote-choice.component.scss
View File

@ -28,6 +28,7 @@ $breakpoint-responsive: 640px; // à définir
position: relative; position: relative;
min-width: 32rem; min-width: 32rem;
min-height: 16rem; min-height: 16rem;
display: block;
padding: $box-padding $box-padding $box-padding calc(#{$box-padding} - #{$box-border-width}); padding: $box-padding $box-padding $box-padding calc(#{$box-padding} - #{$box-border-width});
border-left: $box-border-width solid transparent; border-left: $box-border-width solid transparent;
background-color: $white; background-color: $white;
@ -99,6 +100,7 @@ $breakpoint-responsive: 640px; // à définir
.choicebox__txt { .choicebox__txt {
margin: 0; margin: 0;
font-size: 1.8rem; font-size: 1.8rem;
min-width: 10em;
} }
@ -131,6 +133,7 @@ $breakpoint-responsive: 640px; // à définir
background-color: transparent; background-color: transparent;
border-radius: 50%; border-radius: 50%;
cursor: pointer; cursor: pointer;
float: left;
&--maybe { &--maybe {
position: relative; position: relative;