diff --git a/uvote/api/votes/graphs.php b/uvote/api/votes/graphs.php index 3032ebf..b883bf8 100644 --- a/uvote/api/votes/graphs.php +++ b/uvote/api/votes/graphs.php @@ -28,9 +28,15 @@ class graphs { $result = array(); $res = \SQL\UVOTE_DATA_GRAPH_PARTY_TO_USER_OVERALL_BY_TIME::QQ(array($timespan, \SYSTEM\SECURITY\Security::getUser()->id, $party, \SYSTEM\SECURITY\Security::getUser()->id)); $total = \SQL\UVOTE_DATA_GRAPH_PARTY_TO_USER_OVERALL_BY_TIME_OVERMATCH::Q1(array($party, \SYSTEM\SECURITY\Security::getUser()->id)); + $matchhandler = 0; + $missmatchhandler = 0; while ($row = $res->next()){ + $match = $row['class_match']+$matchhandler; + $missmatch = $row['class_mismatch']+$missmatchhandler; $result[] = array( 0 => $row['day'], - 'class_match' => $row['class_match'] / $total['total']*100); + 'class_match' => ($match) / ($match+$missmatch)*100); + $matchhandler = $match; + $missmatchhandler = $missmatch; } return $returnasjson ? SYSTEM\LOG\JsonResult::toString($result) : $result; } diff --git a/uvote/files/frontend_logos/logo.gif b/uvote/files/frontend_logos/logo.gif new file mode 100644 index 0000000..4d5edd7 Binary files /dev/null and b/uvote/files/frontend_logos/logo.gif differ diff --git a/uvote/files/frontend_logos/logo.psd b/uvote/files/frontend_logos/logo.psd new file mode 100644 index 0000000..98a3964 Binary files /dev/null and b/uvote/files/frontend_logos/logo.psd differ diff --git a/uvote/page/autoload.inc b/uvote/page/autoload.inc index 330800b..84231a5 100644 --- a/uvote/page/autoload.inc +++ b/uvote/page/autoload.inc @@ -3,6 +3,7 @@ SYSTEM\autoload::registerFolder(dirname(__FILE__),''); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_page',''); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_register',''); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/default_comment',''); +SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_impressum',''); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_start',''); SYSTEM\autoload::registerFolder(dirname(__FILE__).'/user_main_votelist',''); diff --git a/uvote/page/default_page/css/default_page.css b/uvote/page/default_page/css/default_page.css index e77f6da..b6fcff9 100644 --- a/uvote/page/default_page/css/default_page.css +++ b/uvote/page/default_page/css/default_page.css @@ -1,5 +1,4 @@ body { - padding-top: 60px; padding-bottom: 40px; } diff --git a/uvote/page/default_page/pics/logo.gif b/uvote/page/default_page/pics/logo.gif new file mode 100644 index 0000000..3d42bc4 Binary files /dev/null and b/uvote/page/default_page/pics/logo.gif differ diff --git a/uvote/page/default_page/tpl/loginform.tpl b/uvote/page/default_page/tpl/loginform.tpl index 4ad6ea1..9057e91 100644 --- a/uvote/page/default_page/tpl/loginform.tpl +++ b/uvote/page/default_page/tpl/loginform.tpl @@ -1,12 +1,10 @@ -
+
+
- -
-
-
+
+
+ +
+
diff --git a/uvote/page/default_page/tpl/menu.tpl b/uvote/page/default_page/tpl/menu.tpl index ef30036..46b460f 100644 --- a/uvote/page/default_page/tpl/menu.tpl +++ b/uvote/page/default_page/tpl/menu.tpl @@ -3,8 +3,8 @@
  •  Start
  •  Abstimmen
  •  Auswerten
    • -
  •  Mithelfen
    • -
  •  Impressum
    • + +
  •  Impressum
  • ${loginform}
    • diff --git a/uvote/page/default_page/tpl/menu_loggedout.tpl b/uvote/page/default_page/tpl/menu_loggedout.tpl index 2a48a6a..53ffbb0 100644 --- a/uvote/page/default_page/tpl/menu_loggedout.tpl +++ b/uvote/page/default_page/tpl/menu_loggedout.tpl @@ -1,5 +1,6 @@
    • ${loginform}
      • +
    diff --git a/uvote/page/default_page/tpl/page.tpl b/uvote/page/default_page/tpl/page.tpl index f411101..32589de 100644 --- a/uvote/page/default_page/tpl/page.tpl +++ b/uvote/page/default_page/tpl/page.tpl @@ -11,36 +11,10 @@
    - -
    +
    -
    - -
    -
    - +
    +
    diff --git a/uvote/page/page_uvote.php b/uvote/page/page_uvote.php index 6f87e38..8c75c83 100644 --- a/uvote/page/page_uvote.php +++ b/uvote/page/page_uvote.php @@ -30,5 +30,8 @@ class page_uvote extends \SYSTEM\API\api_default { if(!\SYSTEM\SECURITY\Security::isLoggedIn()){ return (new default_register ())->html();} return (new user_main_votelist())->html();} + + public static function page_user_main_impressum(){ + return (new user_main_impressum())->html();} } \ No newline at end of file diff --git a/uvote/page/user_main_analysis/js/user_main_analysis.js b/uvote/page/user_main_analysis/js/user_main_analysis.js index dfed045..f02515e 100644 --- a/uvote/page/user_main_analysis/js/user_main_analysis.js +++ b/uvote/page/user_main_analysis/js/user_main_analysis.js @@ -1,6 +1,6 @@ function init_user_main_analysis(){ - +load_visualisation_urvote('graph_user_to_party_overall_bt', 84600); load_visualisation_user_to_party_overall('graph_user_to_party_overall_cdu', 'cdu', 84600); load_visualisation_user_to_party_overall('graph_user_to_party_overall_csu', 'csu', 84600); load_visualisation_user_to_party_overall('graph_user_to_party_overall_spd', 'spd', 84600); @@ -60,7 +60,16 @@ function load_visualisation_urvote(id, timespan){ first = true; data.addRow($.map(value, function(v) { if(first){first=false;return [new Date(v)];}else{return [parseFloat(v)];}}));}); - var options = {title: id, aggregationTarget: 'category', selectionMode: 'multiple', curveType: 'function', /*focusTarget: 'category',*/ chartArea:{}, vAxis:{logScale: false}, interpolateNulls: false, width: "300", height: "250"}; + var options = {title: id, + aggregationTarget: 'category', + selectionMode: 'multiple', + legend: 'none', + curveType: 'function', /*focusTarget: 'category',*/ chartArea:{}, + vAxis:{logScale: false}, + legend: 'none', + interpolateNulls: false, + width: "800", + height: "250"}; new google.visualization.LineChart(document.getElementById(id)).draw(data, options); }); } diff --git a/uvote/page/user_main_analysis/tpl/all_polls.tpl b/uvote/page/user_main_analysis/tpl/all_polls.tpl index 7761481..8911b40 100644 --- a/uvote/page/user_main_analysis/tpl/all_polls.tpl +++ b/uvote/page/user_main_analysis/tpl/all_polls.tpl @@ -1,6 +1,6 @@
    -
    Aktueller Status
    +

    Aktueller Status

    diff --git a/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl b/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl index 610f073..c33feb8 100644 --- a/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl +++ b/uvote/page/user_main_analysis/tpl/user_main_analysis.tpl @@ -15,10 +15,15 @@
    -
    +
    + +

       Deine Daten

    + +
    +
    @@ -26,10 +31,11 @@ ${basic_stats}
    - ${analysis_help_basic stats} - ${analysis_math_basic stats} + ${analysis_help_basic_stats} + ${analysis_math_basic_stats}
    +
    ${user_temp_votes}
    @@ -47,10 +53,14 @@
    -
    +
    + +

       Bilanz: Fraktionen

    +
    +
    @@ -81,10 +91,14 @@
    -
    +
    + +

       Bilanz: Fraktionen nach Stimmverhalten

    +
    +
    @@ -125,10 +139,14 @@
    -
    +
    + +

       Bilanz: Bundestag

    +
    +
    @@ -150,10 +168,14 @@
    -
    +
    + +

       Entwicklung: Fraktionen

    +
    +
    @@ -183,12 +205,36 @@
    +
    -
    -

    +
    + +
    +

       community Statistik

    +
    +
    diff --git a/uvote/page/user_main_analysis/tpl/user_total.tpl b/uvote/page/user_main_analysis/tpl/user_total.tpl index 07576f6..1b5c50f 100644 --- a/uvote/page/user_main_analysis/tpl/user_total.tpl +++ b/uvote/page/user_main_analysis/tpl/user_total.tpl @@ -1,6 +1,6 @@
    -
    Deine Stimmverteilung
    +

    Deine Stimmverteilung

    diff --git a/uvote/page/user_main_analysis/user_main_analysis.php b/uvote/page/user_main_analysis/user_main_analysis.php index 1a9d437..5382d8f 100644 --- a/uvote/page/user_main_analysis/user_main_analysis.php +++ b/uvote/page/user_main_analysis/user_main_analysis.php @@ -79,6 +79,8 @@ class user_main_analysis extends SYSTEM\PAGE\Page { $vars['votes_all_bt'] = $this->votes_all_bt(); $vars['frontend_logos'] = './api.php?call=files&cat=frontend_logos&id='; $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote')); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('help')); + $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('math')); $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('uvote_register')); return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'user_main_analysis/tpl/user_main_analysis.tpl'),$vars); } diff --git a/uvote/page/user_main_impressum/tpl/user_main_impressum.tpl b/uvote/page/user_main_impressum/tpl/user_main_impressum.tpl new file mode 100644 index 0000000..875c1d2 --- /dev/null +++ b/uvote/page/user_main_impressum/tpl/user_main_impressum.tpl @@ -0,0 +1,19 @@ +
    +
    +
    +

    + Impressum +

    +
    +
    +
    + ${impressum_header} + ${impressum_1} + ${impressum_2} + ${impressum_3} + ${impressum_4} + ${impressum_5} +
    +
    +
    +
    diff --git a/uvote/page/user_main_impressum/user_main_impressum.php b/uvote/page/user_main_impressum/user_main_impressum.php new file mode 100644 index 0000000..ac51a6d --- /dev/null +++ b/uvote/page/user_main_impressum/user_main_impressum.php @@ -0,0 +1,10 @@ + +

    diff --git a/uvote/sai/saimod_uvote_vote_edit/main.tpl b/uvote/sai/saimod_uvote_vote_edit/main.tpl index 80e4490..e388a05 100644 --- a/uvote/sai/saimod_uvote_vote_edit/main.tpl +++ b/uvote/sai/saimod_uvote_vote_edit/main.tpl @@ -1,16 +1,38 @@ -
    - - -
    -
    -

    poll start

    - - 00:00 -

    poll end

    - - 00:00 -

    tags

    - +
    +
    +
    + +
    +

    +    ${title} +

    + +
    +     +
    +
    +
    +
    +

    title

    +

    +

    src

    + +

    tags

    + +
    +
    +

    poll start

    + - 00:00 +

    poll end

    + - 00:00 +

    bt choice

    +

    + Submit +
    +
    +
    + ${parties} + Submit +
    -
    - \ No newline at end of file diff --git a/uvote/sai/saimod_uvote_vote_edit/new.tpl b/uvote/sai/saimod_uvote_vote_edit/new.tpl new file mode 100644 index 0000000..80e4490 --- /dev/null +++ b/uvote/sai/saimod_uvote_vote_edit/new.tpl @@ -0,0 +1,16 @@ +
    + + +
    +
    +

    poll start

    + - 00:00 +

    poll end

    + - 00:00 +

    tags

    + +
    +
    +
    +Submit +
    \ No newline at end of file diff --git a/uvote/sai/saimod_uvote_vote_edit/parties.tpl b/uvote/sai/saimod_uvote_vote_edit/parties.tpl new file mode 100644 index 0000000..3dbfbaa --- /dev/null +++ b/uvote/sai/saimod_uvote_vote_edit/parties.tpl @@ -0,0 +1 @@ +${partylist} \ No newline at end of file diff --git a/uvote/sai/saimod_uvote_vote_edit/party.tpl b/uvote/sai/saimod_uvote_vote_edit/party.tpl new file mode 100644 index 0000000..8501250 --- /dev/null +++ b/uvote/sai/saimod_uvote_vote_edit/party.tpl @@ -0,0 +1,12 @@ +
    +
    + +
    +
    + + + + + +
    +
    \ No newline at end of file diff --git a/uvote/sai/saimod_uvote_vote_edit/partynew.tpl b/uvote/sai/saimod_uvote_vote_edit/partynew.tpl new file mode 100644 index 0000000..ee4fdf6 --- /dev/null +++ b/uvote/sai/saimod_uvote_vote_edit/partynew.tpl @@ -0,0 +1,12 @@ +
    +
    + +
    +
    + + + + + +
    +
    \ No newline at end of file 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 79322a9..fdaf697 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 @@ -4,8 +4,9 @@ $('.bt_data_submit').click(function() { var title = $('#' + poll_ID + '_vote_title').val(); var time_end = $('#' + poll_ID + '_time_end').val(); var iframe_link = $('#' + poll_ID + '_iframe_link').val(); + var tags = JSON.stringify($('#' + poll_ID + '_tags').val().split(',').map(function(s) { return s.trim() })); var data = {poll_ID: poll_ID, title: title, time_end: time_end, iframe_link: iframe_link}; - $.getJSON('./sai.php?sai_mod=.SAI.saimod_uvote_vote_edit&action=edit_vote&data=' + JSON.stringify(data), function(data) { + $.getJSON('./sai.php?sai_mod=.SAI.saimod_uvote_vote_edit&action=edit_vote&data=' + JSON.stringify(data) + '&tags=' + tags, function(data) { var items = []; if(data.status == true){ alert("success"); @@ -15,6 +16,24 @@ $('.bt_data_submit').click(function() { }); }); }; +$('.bt_partydata_submit').click(function() { + var poll_ID = $(this).attr('poll_ID'); + var party = $('#input_party').val(); + var votes_pro = $('#input_pro').val(); + var votes_contra = $('#input_con').val(); + var nr_attending = $('#input_att').val(); + var total = $('#input_total').val(); + var choice = $('#input_choice').val(); + var data = {poll_ID: poll_ID, party: party, votes_pro: votes_pro, votes_contra: votes_contra, nr_attending: nr_attending, total: total, choice: choice}; + $.getJSON('./sai.php?sai_mod=.SAI.saimod_uvote_vote_edit&action=edit_partydata&data=' + JSON.stringify(data), function(data) { + var items = []; + if(data.status == true){ + alert("success"); + } else { + alert(data.result.message); + } + }); + }); 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 56432fa..5f9b257 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,9 +14,17 @@ class saimod_uvote_vote_edit extends \SYSTEM\SAI\SaiModule { public static function sai_mod_saimod_uvote_new_vote(){ $ID = array(); $ID['ID'] = ''; - return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_uvote_vote_edit/main.tpl'), $ID); + return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_uvote_vote_edit/new.tpl'), $ID); + } + public static function party_stats($poll_ID){ + $result = ''; + $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_uvote_vote_edit/partynew.tpl')); + $parties = \SQL\UVOTE_DATA_PARTY_PER_POLL::QA(array($poll_ID)); + foreach($parties as $poll){ + $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_uvote_vote_edit/party.tpl'), $poll); + } + return $result; } - public static function sai_mod__SAI_saimod_uvote_vote_edit(){ /*$vars = array(); @@ -28,29 +36,44 @@ class saimod_uvote_vote_edit extends \SYSTEM\SAI\SaiModule { $votes = \votes::getAllVotesOfGroup(1); foreach($votes as $vote){ $time_remain = strtotime($vote['time_end'])- microtime(true); - $time_span = strtotime($vote['time_end']) - strtotime($vote['time_start']); - $vote['vote_class'] = \switchers::tablerow_class(\votes::getUserPollData($vote['ID'])); - $vote['bt_vote_class'] = \switchers::tablerow_class($vote['bt_choice']); + $time_span = strtotime($vote['time_end']) - strtotime($vote['time_start']); $vote['time_left'] = round($time_remain/($time_span+1)*100,0); $vote['time_done'] = 100-$vote['time_left']; - + $vote['parties'] = self::party_stats($vote['ID']); $result .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_uvote_vote_edit/main.tpl'), $vote); } return \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \PSAI(),'saimod_uvote_vote_edit/saimod_uvote_vote_edit.tpl'), array('list' => $result)); } - public static function sai_mod__SAI_saimod_uvote_vote_edit_action_edit_vote($data_json){ + public static function sai_mod__SAI_saimod_uvote_vote_edit_action_edit_vote($data_json, $tags_json){ + $tags = \json_decode($tags_json); $data_stdClass = \json_decode($data_json); $data = (array)$data_stdClass; if(!$data['poll_ID']){ new \SYSTEM\LOG\WARNING(print_r($data, TRUE)); - \SYSTEM\DBD\SYS_TEXT_SAVE::QI(array($stamp,'deDE',$data['title'], 'wed', '')); - \SYSTEM\DBD\SYS_TEXT_SAVE_TAG::QI(array($stamp,$tag)); + \SYSTEM\PAGE\text::save($data['title'], $data['title'], 'deDE', $tags, 'blanc'); return \SQL\UVOTE_DATA_NEW_POLL::QA(array($data['title'], $data['time_end'], $data['iframe_link'])); } return \SQL\UVOTE_DATA_EDIT_POLL::QA(array($data['poll_ID'], $data['title'], $data['time_end'], $data['iframe_link'])); } + public static function sai_mod__SAI_saimod_uvote_vote_edit_action_edit_partydata($data_json){ + $datastd = \json_decode($data_json); + $data = (array)$datastd; + new \SYSTEM\LOG\WARNING(print_r($data, TRUE)); + return \SQL\UVOTE_DATA_EDIT_PARTYDATA::QA(array($data['poll_ID'], + $data['party'], + $data['votes_pro'], + $data['votes_contra'], + $data['nr_attending'], + $data['total'], + $data['choice'], + $data['votes_pro'], + $data['votes_contra'], + $data['nr_attending'], + $data['total'], + $data['choice'])); + } public static function html_li_menu(){return '
  • Edit Votes
    • ';} public static function right_public(){return false;} public static function right_right(){return \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI);} diff --git a/uvote/sai/saimod_uvote_vote_edit/vote.tpl b/uvote/sai/saimod_uvote_vote_edit/vote.tpl index cce4f0d..aa83cc9 100644 --- a/uvote/sai/saimod_uvote_vote_edit/vote.tpl +++ b/uvote/sai/saimod_uvote_vote_edit/vote.tpl @@ -10,46 +10,7 @@ Edit
    -
    -
    - cdu -
    -
    - -
    -
    -
    -
    - csu -
    -
    - -
    -
    -
    -
    - spd -
    -
    - -
    -
    -
    -
    - grüne -
    -
    - -
    -
    -
    -
    - linke -
    -
    - -
    -
    +
    uv diff --git a/uvote/sql/qq/UVOTE_DATA_EDIT_NEW_POLL.php b/uvote/sql/qq/UVOTE_DATA_EDIT_NEW_POLL.php new file mode 100644 index 0000000..44720ff --- /dev/null +++ b/uvote/sql/qq/UVOTE_DATA_EDIT_NEW_POLL.php @@ -0,0 +1,8 @@ +