From e6436f8abc1e9c793abe884f1809edfd6b982054 Mon Sep 17 00:00:00 2001
From: Nael <t.rechel@gmx.de>
Date: Tue, 11 Mar 2014 01:57:54 +0100
Subject: [PATCH] comment now formatted and working properly

---
 uVote/api/votes/votes.php                     |  2 +-
 .../qq/UVOTE_DATA_USER_COMMENTRATE_INSERT.php |  3 +--
 uVote/page/default_bulletin/bars_user.tpl     |  1 +
 uVote/page/default_bulletin/bulletin.tpl      | 25 ++++++++-----------
 uVote/page/default_bulletin/comment.tpl       | 14 ++++++-----
 .../default_bulletin/default_bulletin.php     | 13 +++++++---
 uVote/page/default_bulletin/table_bt.tpl      |  2 +-
 uVote/page/default_bulletin/table_parties.tpl |  5 ++--
 uVote/page/default_bulletin/vote_bt.tpl       |  2 +-
 uVote/page/default_page/js/loadtexts.js       | 10 +++++---
 10 files changed, 42 insertions(+), 35 deletions(-)

diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php
index da8d590..ceb1abf 100644
--- a/uVote/api/votes/votes.php
+++ b/uVote/api/votes/votes.php
@@ -196,7 +196,7 @@ class votes {
     public static function write_commentrate($c_ID, $val){
         if(!\SYSTEM\SECURITY\Security::isLoggedIn()){
             throw new ERROR("You need to be logged in.");}
-        return \DBD\UVOTE_DATA_USER_COMMENTRATE_INSERT::Q1(array($c_ID, \SYSTEM\SECURITY\Security::getUser()->id, $val));}
+        return \DBD\UVOTE_DATA_USER_COMMENTRATE_INSERT::Q1(array($c_ID, \SYSTEM\SECURITY\Security::getUser()->id, $val, $c_ID, \SYSTEM\SECURITY\Security::getUser()->id, $val));}
         
     public static function get_add_data(){
         return \DBD\UVOTE_DATA_USER_ADD_DATA::Q1(array(\SYSTEM\SECURITY\Security::getUser()->id)); 
diff --git a/uVote/dbd/qq/UVOTE_DATA_USER_COMMENTRATE_INSERT.php b/uVote/dbd/qq/UVOTE_DATA_USER_COMMENTRATE_INSERT.php
index 743bea7..e31e1f6 100644
--- a/uVote/dbd/qq/UVOTE_DATA_USER_COMMENTRATE_INSERT.php
+++ b/uVote/dbd/qq/UVOTE_DATA_USER_COMMENTRATE_INSERT.php
@@ -7,6 +7,5 @@ class UVOTE_DATA_USER_COMMENTRATE_INSERT extends \SYSTEM\DB\QP {
 //pg            
 '',
 //mys
-'INSERT INTO `uvote_user_comments_additional` (`c_ID`, `user_ID`, `val`, `timestamp`) 
-    VALUES (?, ?, ?, NOW());'
+'INSERT INTO `uvote_user_comments_additional`  (`c_ID`, `user_ID`, `val`, `timestamp`) VALUES (?, ?, ?, NOW()) ON DUPLICATE KEY UPDATE `c_ID` = ?, `user_ID` = ?, `val` = ?, `timestamp` = NOW();'
 );}}
\ No newline at end of file
diff --git a/uVote/page/default_bulletin/bars_user.tpl b/uVote/page/default_bulletin/bars_user.tpl
index 38ded74..77d82cd 100644
--- a/uVote/page/default_bulletin/bars_user.tpl
+++ b/uVote/page/default_bulletin/bars_user.tpl
@@ -4,3 +4,4 @@ ${urvote_bars_user}
       <div class="bar bar-success" style="width: ${vote_yes_perc}%;">${vote_yes_perc}%</div>
       <div class="bar bar-danger" style="width: ${vote_no_perc}%;">${vote_no_perc}%</div>
       <div class="bar bar-info" style="width: ${vote_ent_perc}%;">${vote_ent_perc}%</div>
+    </div>
diff --git a/uVote/page/default_bulletin/bulletin.tpl b/uVote/page/default_bulletin/bulletin.tpl
index a27dcec..8b30687 100644
--- a/uVote/page/default_bulletin/bulletin.tpl
+++ b/uVote/page/default_bulletin/bulletin.tpl
@@ -12,27 +12,24 @@
     <div>
         ${voice_weight}
     </div>
-    <div style="float: left; width: 50%"> 
-        <div>      
-           ${bars_user}    
-        </div>  
-        <div>         
+    <div style="float: left; width: 50%; padding-top: 30px"> 
+           ${bars_user}<br>      
            ${bars_bt}
-        </div>
     </div>
-    <div style="width: 50%;">   
+    <div style="float: right; width: 50%; padding-top: 30px">   
         ${icons_party}
         ${choice_party}
     </div>
-    <div style="clear: both"></div>
-
-
-    <div style="padding-top: 30px; width: 100%;">
-        <div style="width: 50%; float: left">
+    <div class="divider" style="clear: both"></div>
+    <br>
+    <div style="padding-top: 30px;">
+    <h4>Kommentare</h4>
+    <div style="padding-top: 20px;">
+        <div style="float: left; width: 40%">
             <h5>Pro</h5>
             ${comments_pro}
         </div>
-        <div style="width: 50%; float: right">
+        <div style="float: right; width: 40%">
             <h5>Contra</h5>
             ${comments_con}
         </div>
@@ -50,7 +47,7 @@
             </select><br>
             <div class="btn btn-primary submit_pro" id="submit_pro" poll_ID="${poll_ID}">${submit}</div>  
     </div>
-  
+    </div>
 
 
 <!--<div class="btn" id="test">
diff --git a/uVote/page/default_bulletin/comment.tpl b/uVote/page/default_bulletin/comment.tpl
index 54f4a99..687a1ce 100644
--- a/uVote/page/default_bulletin/comment.tpl
+++ b/uVote/page/default_bulletin/comment.tpl
@@ -1,15 +1,17 @@
-<div style="float: left">
-<div><font size="1">${timestamp}</font></div>
+<div style="float: left; width: 90%;">
+<div style="float: left"><font size="1">${timestamp}</font></div>
+<a style="float: right" class="btn btn-warning btn-mini c_spam" c_ID="${c_ID}"><i class="icon-white icon-exclamation-sign"></i></a>
+<div style="clear: both"></div>
 <div>${c_txt}</div>
 <br>
 <div style="">
-    <font size="2">${nr_up}</font>
+    <font size="2">${count_up}</font>
     <a class="btn btn-success btn-mini c_up" c_ID="${c_ID}"><i class="icon-white icon-thumbs-up"></i></a>
-    <font size="2">${nr_down}</font>
+    <font size="2">${count_down}</font>
     <a class="btn btn-danger btn-mini c_down" c_ID="${c_ID}"><i class="icon-white icon-thumbs-down"></i></a>
-    <a class="btn btn-warning btn-mini c_spam" c_ID="${c_ID}"><i class="icon-white icon-exclamation-sign"></i></a>
+    <div style="float: right"><font size="1">Quelle:</font><font size="2">${c_src}</font></div>
 </div>
-<div><font size="1">Quelle:</font><font size="2">${c_src}</font></div>
+
 </div>
 
 <br>
\ No newline at end of file
diff --git a/uVote/page/default_bulletin/default_bulletin.php b/uVote/page/default_bulletin/default_bulletin.php
index 1d49487..0e7cce7 100644
--- a/uVote/page/default_bulletin/default_bulletin.php
+++ b/uVote/page/default_bulletin/default_bulletin.php
@@ -47,7 +47,7 @@ class default_bulletin extends SYSTEM\PAGE\Page {
                                     array(  'party' => $pv['party'],
                                             'choice' => $this->get_party_per_poll($pv['choice']),
                                             'choice_class' => $this->tablerow_class($pv['choice']),
-                                            'party_yes' => $pv['votes_pro'] > 0 ? round($pv['votes_pro']/$pv['total']*100,0) : 'votes_pro',
+                                            'party_yes' => $pv['votes_pro'] > 0 ? round($pv['votes_pro']/$pv['total']*100,0) : $pv['votes_pro'],
                                             'party_no' => $pv['votes_contra'] > 0 ? round($pv['votes_contra']/$pv['total']*100,0) : $pv['votes_contra'],
                                             'party_off' => $pv['total'] > 0 ? round(($pv['total'] - $pv['nr_attending'])/$pv['total']*100,0) : $pv['total'],
                                             'party_ent' => $pv['nr_attending'] > 0 ? round(($pv['nr_attending'] - $pv['votes_pro'] - $pv['votes_contra'])/$pv['nr_attending']*100,0) : $pv['nr_attending']));                    
@@ -60,7 +60,10 @@ class default_bulletin extends SYSTEM\PAGE\Page {
         $vars = votes::getUserComments($this->poll_ID, 1);
         
         foreach($vars as $com){
-            $com['count'] = votes::get_commentrate($com['c_ID'], 1);
+            $rating = votes::get_commentrate($com['c_ID'], 1);
+            $com['count_up'] = $rating['count'];
+            $rating2 = votes::get_commentrate($com['c_ID'], 2);
+            $com['count_down'] = $rating2['count'];
             $com['c_txt'] = utf8_encode($com['c_txt']);
             $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/comment.tpl'), $com);
         }
@@ -72,8 +75,10 @@ class default_bulletin extends SYSTEM\PAGE\Page {
         $vars = votes::getUserComments($this->poll_ID, 2); 
                      
         foreach($vars as $com){
-            $com['count'] = votes::get_commentrate($com['c_ID'], 2);
-            $com['nr_down'] = $c['count'];
+            $rating = votes::get_commentrate($com['c_ID'], 1);
+            $com['count_up'] = $rating['count'];
+            $rating2 = votes::get_commentrate($com['c_ID'], 2);
+            $com['count_down'] = $rating2['count'];
             $com['c_txt'] = utf8_encode($com['c_txt']);
             $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/comment.tpl'), $com);
         }
diff --git a/uVote/page/default_bulletin/table_bt.tpl b/uVote/page/default_bulletin/table_bt.tpl
index 19fbaa4..5e75d86 100644
--- a/uVote/page/default_bulletin/table_bt.tpl
+++ b/uVote/page/default_bulletin/table_bt.tpl
@@ -3,4 +3,4 @@ Ergebnis Bundestag
       <div class="bar bar-success" style="width: ${bt_pro}%;">${bt_pro}%</div>
       <div class="bar bar-danger" style="width: ${bt_con}%;">${bt_con}%</div>
       <div class="bar bar-info" style="width: ${bt_ent}%;"><p>${bt_ent}%</p></div>
-
+    </div>
diff --git a/uVote/page/default_bulletin/table_parties.tpl b/uVote/page/default_bulletin/table_parties.tpl
index aced008..699e779 100644
--- a/uVote/page/default_bulletin/table_parties.tpl
+++ b/uVote/page/default_bulletin/table_parties.tpl
@@ -1,7 +1,6 @@
-<div style="float: right; margin-right: 10px;">
-        <div style="width: 50px; height: 20px;">
+
+        <div style="width: 50px; height: 20px; float: right; margin-right: 10px;">
           <div class="badge badge-success" style="">${party_yes}%</div>
           <div class="badge badge-danger" style="">${party_no}%</div>
           <div class="badge badge-info" style="">${party_ent}%</div>
         </div>
-</div>
\ No newline at end of file
diff --git a/uVote/page/default_bulletin/vote_bt.tpl b/uVote/page/default_bulletin/vote_bt.tpl
index a25b758..05813f2 100644
--- a/uVote/page/default_bulletin/vote_bt.tpl
+++ b/uVote/page/default_bulletin/vote_bt.tpl
@@ -1,5 +1,5 @@
 <div style="width: 500px; float: left">   
-    <div style="float: left"><img src="${frontend_logos}icon_${party}.png" width="30"/></div>
+    <div style="float: left"><img src="${frontend_logos}icon_${party}.png" width="30"></div>
     <div style="margin-left: 5px; width: 20px; float: left"class="badge ${choice_class}">${choice}</div>
     <div style="margin-left: 5px; width: 20px; float: left"class="badge badge-success">${party_yes}%</div>
     <div style="margin-left: 5px; width: 20px; float: left"class="badge badge-important">${party_no}%</div>
diff --git a/uVote/page/default_page/js/loadtexts.js b/uVote/page/default_page/js/loadtexts.js
index 281d082..7c743c3 100644
--- a/uVote/page/default_page/js/loadtexts.js
+++ b/uVote/page/default_page/js/loadtexts.js
@@ -215,10 +215,9 @@ function vote_click (poll_ID, vote) {
 }
 
 function submit_commentrate (c_ID, val) {
-    $.getJSON('./api.php?call=vote&action=commentrate&c_ID=' + c_ID + '&val=' + val, function(data) {
+    $.getJSON('./api.php?call=vote&action=commentrate&c_ID=' + c_ID + '&val=' + val, function(data) {   
         var items = [];   
-        if(data.status == true){
-            alert("success");                       
+        if(data.status == true){                  
         } else {
             alert(data.result.message);
         }
@@ -297,12 +296,17 @@ function open_vote (poll_ID) {
             });
         $('.c_up').click(function () {
                    submit_commentrate($(this).attr('c_ID'), 1);
+                   alert("Daumen hoch!");
+                   $('#count_up').reload();
                 });
         $('.c_down').click(function () {
                    submit_commentrate($(this).attr('c_ID'), 2);
+                   alert("Daumen runter!");
+                   $('#count_down').reload();
                 });
         $('.c_spam').click(function () {
                    submit_commentrate($(this).attr('c_ID'), 3);
+                   alert("Als Spammer gemeldet");
                 });
         $('#test').click(function(){
             $('#myModal').modal();