diff --git a/src/app/pages/voting/voting-summary/voting-summary.component.html b/src/app/pages/voting/voting-summary/voting-summary.component.html index eb2e2951..1dbaeb82 100644 --- a/src/app/pages/voting/voting-summary/voting-summary.component.html +++ b/src/app/pages/voting/voting-summary/voting-summary.component.html @@ -13,12 +13,23 @@ Pseudo - {{choice.text}} + + + + + points + + + {{ 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)}} + + + + + + + + yes {{config.currentPoll.choices_count.counts[k].yes.count}} +
+ maybe + {{(config.currentPoll.choices_count.counts[k].yes.maybe ? config.currentPoll.choices_count.counts[k].yes.count * 0.5 : 0)}} + +
+ no {{(config.currentPoll.choices_count.counts[k].yes.maybe ? config.currentPoll.choices_count.counts[k].maybe.count * 0.5 : 0)}} + + + diff --git a/src/app/pages/voting/voting-summary/voting-summary.component.ts b/src/app/pages/voting/voting-summary/voting-summary.component.ts index 60d73082..c2cee954 100644 --- a/src/app/pages/voting/voting-summary/voting-summary.component.ts +++ b/src/app/pages/voting/voting-summary/voting-summary.component.ts @@ -16,7 +16,7 @@ export class VotingSummaryComponent implements OnInit { @Input() pollconfig = mockPoll3; - constructor(private config: ConfigService) { + constructor(public config: ConfigService) { } diff --git a/src/app/ui/vote-choice/vote-choice.component.scss b/src/app/ui/vote-choice/vote-choice.component.scss index 31c4c73b..afbee2df 100644 --- a/src/app/ui/vote-choice/vote-choice.component.scss +++ b/src/app/ui/vote-choice/vote-choice.component.scss @@ -28,6 +28,7 @@ $breakpoint-responsive: 640px; // à définir position: relative; min-width: 32rem; min-height: 16rem; + display: block; padding: $box-padding $box-padding $box-padding calc(#{$box-padding} - #{$box-border-width}); border-left: $box-border-width solid transparent; background-color: $white; @@ -99,6 +100,7 @@ $breakpoint-responsive: 640px; // à définir .choicebox__txt { margin: 0; font-size: 1.8rem; + min-width: 10em; } @@ -131,6 +133,7 @@ $breakpoint-responsive: 640px; // à définir background-color: transparent; border-radius: 50%; cursor: pointer; + float: left; &--maybe { position: relative;