From ea7262fdbc4622a3b017c465e4a2afa86c87637b Mon Sep 17 00:00:00 2001 From: Nael Date: Wed, 12 Mar 2014 19:53:55 +0100 Subject: [PATCH] sum kind of utf-8 prob in comment function. problem is encoding in js 90% sure --- uVote/api/votes/votes.php | 11 ++----- uVote/dbd/qq/UVOTE_DATA_NEW_POLL.php | 12 +++++++ .../default_bulletin/default_bulletin.php | 9 ++++-- uVote/page/default_page/js/loadtexts.js | 5 +-- .../saimod_uvote_vote_edit.js | 16 +++++----- .../saimod_uvote_vote_edit.php | 8 +++++ .../saimod_uvote_vote_edit.tpl | 1 + uVote/sai/saimod_uvote_vote_edit/vote.tpl | 31 ++++++++++++++----- 8 files changed, 66 insertions(+), 27 deletions(-) create mode 100644 uVote/dbd/qq/UVOTE_DATA_NEW_POLL.php diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php index 0a7a41b..0ffb01d 100644 --- a/uVote/api/votes/votes.php +++ b/uVote/api/votes/votes.php @@ -210,16 +210,11 @@ class votes { public static function get_add_data(){ return \DBD\UVOTE_DATA_USER_ADD_DATA::Q1(array(\SYSTEM\SECURITY\Security::getUser()->id)); + } + public static function write_poll($ID, $title, $iframe_link ){ + return \DBD\UVOTE_DATA_NEW_POLL::Q1($ID, $title, $iframe_link); } - public static function write_poll($ID, $title, $iframe_link ){ - $con = new \SYSTEM\DB\Connection(new \DBD\uVote()); - $res = $con->prepare( 'insertPoll', - 'INSERT INTO uvote_votes - VALUES (?, ?, ?);', - array($ID, $title, $iframe_link)); - return JsonResult::ok(); - } public static function write_feedback($feedback){ $feedback = json_decode($feedback); diff --git a/uVote/dbd/qq/UVOTE_DATA_NEW_POLL.php b/uVote/dbd/qq/UVOTE_DATA_NEW_POLL.php new file mode 100644 index 0000000..b86319f --- /dev/null +++ b/uVote/dbd/qq/UVOTE_DATA_NEW_POLL.php @@ -0,0 +1,12 @@ +poll_ID); + if (!$vars['bt_total']){ + return '';} + $info = array(); + return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_bulletin/icons_table_parties.tpl'), $info); } private function bars_bt(){ $vars = votes::get_bar_bt_per_poll($this->poll_ID); if (!$vars['bt_total']){ - return 'no data yet';} + return 'Keine Ergebnisse für den Bundestag verfügbar';} $vars['bt_ent'] = round(($vars['bt_attending'] - $vars['bt_pro'] - $vars['bt_con'])/$vars['bt_total']*100,0); $vars['bt_pro'] = round($vars['bt_pro']/$vars['bt_total']*100,0); $vars['bt_con'] = round($vars['bt_con']/$vars['bt_total']*100,0); diff --git a/uVote/page/default_page/js/loadtexts.js b/uVote/page/default_page/js/loadtexts.js index fb4b49e..6fabc4f 100644 --- a/uVote/page/default_page/js/loadtexts.js +++ b/uVote/page/default_page/js/loadtexts.js @@ -215,7 +215,8 @@ 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) { + alert('success'); var items = []; if(data.status == true){ } else { @@ -229,7 +230,6 @@ function submit_c_data (poll_ID) { var c_src = $("#c_src_pro").val(); var a = document.getElementById("side_select"); var c_choice = a.options[a.selectedIndex].value; - alert(c_choice); $.getJSON('./api.php?call=vote&action=comment&poll_ID=' + poll_ID + '&c_choice=' + c_choice + '&c_txt=' + c_txt + '&c_src=' + c_src, function(data) { var items = []; if(data.status == true){ @@ -253,6 +253,7 @@ function submit_add_data () { var d = document.getElementById("children"); var children = d.options[d.selectedIndex].text; $.getJSON('./api.php?call=vote&action=data&location=' + location + '&birthyear=' + birthyear + '&gender=' + gender + '&children=' + children, function(data) { + var items = []; if(data.status == true){ alert("success"); diff --git a/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js b/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js index 074bc04..5d55a63 100644 --- a/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js +++ b/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.js @@ -1,12 +1,12 @@ function init_saimod_uvote_vote_edit(){ - $('#vote_data_submit').click(function() { - vote_data_edit(array( - $('#vote_title').val(title), - $('#iframe_link').val(iframe_link), - $('#poll_ID').val(poll_ID) - )); + $('.btn_editvote').click(function() { alert (''); + var poll_ID = $('#input_poll_ID').val(); + var title = $('#input_poll_title').val(); + var iframe_link = $('#input_poll_link').val(); + vote_data_edit(poll_ID, title, iframe_link); + // var data = new Array(); @@ -31,7 +31,9 @@ function init_saimod_uvote_vote_edit(){ function vote_data_edit (poll_ID, title, iframe_link) { - $.getJSON('./api.php?call=vote&action=vote&poll_ID=' + poll_ID + 'title=' + title + '&iframe_link=' + iframe_link, function(data) { + alert('vote_data_edit'); + + $.getJSON('./api.php?call=vote&action=new_vote&poll_ID=' + poll_ID + 'title=' + title + '&iframe_link=' + iframe_link, function(data) { var items = []; if(data.status == true){ alert("success"); diff --git a/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php b/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php index dc86841..5d77eb4 100644 --- a/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php +++ b/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.php @@ -14,6 +14,14 @@ class saimod_uvote_vote_edit extends \SYSTEM\SAI\SaiModule { $vars = votes::insertPartyChoice($poll_ID, $party, $votes_pro, $votes_contra, $nr_attending, $total, $choice); } + public static function sai_mod_saimod_uvote_new_vote(){ + $result = ''; + $vote = array(); + $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_uvote_vote_edit/vote.tpl'), $vote); + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PSAI(),'saimod_uvote_vote_edit/saimod_uvote_vote_edit.tpl'), array('vote' => $result)); + } + + public static function sai_mod_saimod_uvote_vote_edit(){ /*$vars = array(); $vars['frontend_logos'] = \SYSTEM\CONFIG\config::get(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_BASEURL).'api.php?call=img&cat=frontend_logos&id='; diff --git a/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.tpl b/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.tpl index 7d78a7a..65dae2b 100644 --- a/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.tpl +++ b/uVote/sai/saimod_uvote_vote_edit/saimod_uvote_vote_edit.tpl @@ -1,3 +1,4 @@ +${vote} ${list}
\ No newline at end of file diff --git a/uVote/sai/saimod_uvote_vote_edit/vote.tpl b/uVote/sai/saimod_uvote_vote_edit/vote.tpl index 38d48ed..ba0a9c5 100644 --- a/uVote/sai/saimod_uvote_vote_edit/vote.tpl +++ b/uVote/sai/saimod_uvote_vote_edit/vote.tpl @@ -1,6 +1,8 @@ - ${title} + + + Nr.${ID} @@ -8,12 +10,27 @@ Edit - - cdu123
- csu123
- spd123
- grüne123
- linke123 + + cdu + 123 + 123 + 123
+ csu123 + 123 + 123 + 123
+ spd123 + 123 + 123 + 123
+ grüne123 + 123 + 123 + 123
+ linke123 + 123 + 123 + 123
uv