Merge pull request #859 from eciis/fix-reload-shared-survey-post

Fix shared survey post when reload the post
eciis · Mar 2, 2018 · 9a9f9cd · 9a9f9cd
2 parents 087b486 + 4eb37ea
commit 9a9f9cd
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 19 deletions.
diff --git a/frontend/post/postDetailsDirective.js b/frontend/post/postDetailsDirective.js
@@ -109,6 +109,11 @@
                 !postDetailsCtrl.isDeleted(postDetailsCtrl.post);
         };
 
+        postDetailsCtrl.showSharedPostText = function showSharedPostText() {
+            return !postDetailsCtrl.isDeleted(postDetailsCtrl.post.shared_post) &&
+                !postDetailsCtrl.post.shared_post.type_survey;
+        };
+
         postDetailsCtrl.showSharedEvent = function showSharedEvent() {
             return postDetailsCtrl.post.shared_event &&
                 !postDetailsCtrl.isDeleted(postDetailsCtrl.post) &&

diff --git a/frontend/post/post_details.html b/frontend/post/post_details.html
@@ -118,7 +118,7 @@
         <span>por {{postDetailsCtrl.post.last_modified_by}} {{postDetailsCtrl.post.last_modified_date | amUtc | amLocal | amCalendar:referenceTime:formats }}.</span>
       </div>
     </div>
-    <md-card-content layout="column">
+    <md-card-content layout="column" ng-class="postDetailsCtrl.post.shared_post.type_survey ? 'shared-survey' : ''">
       <img class="md-card-image" ng-if="postDetailsCtrl.showImage(postDetailsCtrl.post.shared_post)"
         style="width: 100%; height: auto;" ng-src="{{ postDetailsCtrl.post.shared_post.photo_url }}"/>
       <div class="youtube-player" ng-if="postDetailsCtrl.showVideo(postDetailsCtrl.post.shared_post)">
@@ -129,16 +129,19 @@
       href class="md-text hyperlink" ng-click="postDetailsCtrl.goToPost(postDetailsCtrl.post.shared_post)">
         <span>{{ postDetailsCtrl.post.shared_post.title }}</span>
       </a>
-      <p class="text" ng-if="!postDetailsCtrl.isDeleted(postDetailsCtrl.post.shared_post)"
+      <p class="text" ng-if="postDetailsCtrl.showSharedPostText()"
         ng-bind-html="postDetailsCtrl.postToURL(postDetailsCtrl.post.shared_post).text" ></p>
-      <div layout="row" layout-align="end-center">
-        <a href class="md-text hyperlink" ng-click="postDetailsCtrl.goToPost(postDetailsCtrl.post.shared_post)"
-          ng-if="postDetailsCtrl.isLongPostTimeline(postDetailsCtrl.post.shared_post.text)">
+      <div layout="row" layout-align="end-center"
+        ng-if="postDetailsCtrl.isLongPostTimeline(postDetailsCtrl.post.shared_post.text)">
+        <a href class="md-text hyperlink" 
+          ng-click="postDetailsCtrl.goToPost(postDetailsCtrl.post.shared_post)">
           <md-icon>more_horiz</md-icon>
         </a>
       </div>
-      <pdf-view pdf-files='postDetailsCtrl.post.shared_post.pdf_files' is-editing="false"></pdf-view>
-      <survey-details ng-if="postDetailsCtrl.post.shared_post.type_survey" post="postDetailsCtrl.post.shared_post" posts="postDetailsCtrl.posts" user="postDetailsCtrl.user" isdialog="false"></survey-details>
+      <pdf-view ng-if="postDetailsCtrl.showSharedPostText()" pdf-files='postDetailsCtrl.post.shared_post.pdf_files' is-editing="false"></pdf-view>
+      <survey-details ng-if="postDetailsCtrl.post.shared_post.type_survey" 
+        post="postDetailsCtrl.post.shared_post" posts="postDetailsCtrl.posts" 
+        user="postDetailsCtrl.user" isdialog="false"></survey-details>
     </md-card-content>
   </md-card>
 

diff --git a/frontend/styles/custom.css b/frontend/styles/custom.css
@@ -968,3 +968,8 @@ md-input-container:not(.md-input-invalid).md-input-has-value .inputEmail {
     text-align: center;
     font-size: 15px;
 }
+
+.shared-survey{
+    padding-top :0px;
+    margin-top : -25px;
+}
diff --git a/frontend/survey/surveyDetailsDirective.js b/frontend/survey/surveyDetailsDirective.js
@@ -35,7 +35,7 @@
         surveyCtrl.userVoted = function(){
             var voted = false;
             _.forEach(surveyCtrl.post.options, function(option) {
-                if(surveyCtrl.votedOption(option)) {voted = true;}
+                (surveyCtrl.votedOption(option)) ? voted = true : null;
             });
             return voted;
         };
@@ -95,7 +95,6 @@
             var promise = SurveyService.vote(surveyCtrl.post, surveyCtrl.optionsSelected);
             promise.then(function sucess(){
                 addVote(surveyCtrl.optionsSelected);
-                calculatePercentage();
                 MessageService.showToast('Voto computado');
             });
             return promise;
@@ -124,20 +123,22 @@
             _.forEach(options, function(option) {
                 surveyCtrl.post.number_votes += 1;
                 option.number_votes += 1;
+                calculatePercentage(option);
                 var voter = {'name': surveyCtrl.user.name,
                              'photo_url': surveyCtrl.user.photo_url,
                              'key': Utils.getKeyFromUrl(surveyCtrl.user.key) };
                 option.voters.push(voter);
             });
         }
 
-        function calculatePercentage(){
-            if(surveyCtrl.post){
-                _.forEach(surveyCtrl.post.options, function(option) {
-                    var percentage = (option.number_votes / surveyCtrl.post.number_votes) * 100;
-                    option.percentage = surveyCtrl.post.number_votes === 0 ? 0 : percentage.toFixed(0);
-                });
-            }
+        function calculatePercentage(option){
+            option.percentage =  (surveyCtrl.post.number_votes === 0) ? 0 :
+                ((option.number_votes / surveyCtrl.post.number_votes) * 100).toFixed(0);
+        }
+
+        surveyCtrl.getPercentage = function getPercentage(option){
+            (!option.percentage) ? calculatePercentage(option) : null;
+            return option.percentage + "%";
         }
 
         surveyCtrl.scrollbarConfig = {
@@ -148,7 +149,6 @@
 
         surveyCtrl.loadAttributes = function(){
             loadBinarySelected();
-            calculatePercentage();
         };
 
         surveyCtrl.showMenu = function(ev, option) {

diff --git a/frontend/survey/survey_details.html b/frontend/survey/survey_details.html
@@ -21,9 +21,10 @@
           ng-if="surveyCtrl.showCheckboxButton()" ng-model="option.selected"></md-checkbox>
         <p ng-if="!surveyCtrl.isPostPage">{{surveyCtrl.getOption(option.text)}}</p>
         <p ng-if="surveyCtrl.isPostPage">{{option.text}}</p>
-        <div ng-if="surveyCtrl.userVoted() || surveyCtrl.isSurveyAuthor() || surveyCtrl.timeHasBeenExpired()" ng-click="surveyCtrl.showMenu($event, option)" title="Clique para ver quem votou nessa opção">
+        <div ng-if="surveyCtrl.userVoted() || surveyCtrl.isSurveyAuthor() || surveyCtrl.timeHasBeenExpired()" 
+          ng-click="surveyCtrl.showMenu($event, option)" title="Clique para ver quem votou nessa opção">
           <div ng-class="surveyCtrl.votedOption(option)?'percentage-selected':'option-percentage'">
-            {{option.percentage ? option.percentage : 0}}%
+            {{surveyCtrl.getPercentage(option)}}
           </div>
         </div>
       </md-list-item>