diff --git a/config.php b/config.php index 2434313..ee89ee8 100644 --- a/config.php +++ b/config.php @@ -10,5 +10,10 @@ $uvote_config = array( array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_ERRORREPORTIN array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_PASSWORD, 'dsjgfasudzfsvad'), array(SYSTEM\CONFIG\config_ids::SYS_CONFIG_DB_DBNAME, 'host_uVote'), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_PATH_SYSTEMPATHREL, '../system/'), + array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_NAVIMG, '/web/system/sai/page/default_page/img/logo.png'),//not working, cuz paths are not set yet! \SYSTEM\WEBPATH(new \SYSTEM\PSAI(),'page/default_page/img/logo.png')), + array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_BASEURL, 'http://mojotrollz.eu/web/uVote/sai.php?'), + array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_TITLE, 'mojotrollz - Admin Area'), + array(\SYSTEM\CONFIG\config_ids::SYS_SAI_CONFIG_COPYRIGHT, 'uVote, © WebCraft Media 2013'), + array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_LANGS, array('deDE', 'enUS', 'huHU')), array(\SYSTEM\CONFIG\config_ids::SYS_CONFIG_DEFAULT_LANG, 'deDE')); \ No newline at end of file diff --git a/sai.php b/sai.php new file mode 100644 index 0000000..63c1dee --- /dev/null +++ b/sai.php @@ -0,0 +1,17 @@ +html(); \ No newline at end of file diff --git a/uVote/api/api_uvote.php b/uVote/api/api_uvote.php index 40709df..a84e4c1 100644 --- a/uVote/api/api_uvote.php +++ b/uVote/api/api_uvote.php @@ -2,7 +2,13 @@ class api_uvote extends \SYSTEM\API\api_login { public static function call_vote_action_vote($poll_ID, $vote) { - return votes::write_vote($poll_ID, $vote);} + return votes::write_vote($poll_ID, $vote); + + } + public static function call_vote_action_open_vote($poll_ID) { + return votes::open_vote($poll_ID); + + } public static function call_vote_action_barsperusers($poll_ID){ return votes::get_barsperusers($poll_ID);} } \ No newline at end of file diff --git a/uVote/api/votes/votes.php b/uVote/api/votes/votes.php index 6e14295..a0a79f4 100644 --- a/uVote/api/votes/votes.php +++ b/uVote/api/votes/votes.php @@ -12,6 +12,15 @@ class votes { return $result; } + + public static function getVoteOfGroup($poll_ID){ + $con = new \SYSTEM\DB\Connection(new \DBD\uVote()); + $res = $con->prepare( 'selVoteByGrp', + 'SELECT * FROM `uvote_votes` WHERE `ID` = ? LIMIT 1;', + array($poll_ID)); + $result = $res->next(); + return $result; + } public static function get_barsperusers($poll_ID,$return_as_json = true){ $con = new \SYSTEM\DB\Connection(new \DBD\uVote()); @@ -86,4 +95,19 @@ class votes { array($poll_ID, \SYSTEM\SECURITY\Security::getUser()->id, $vote)); return JsonResult::ok(); } + public static function open_vote($poll_ID){ + new \SYSTEM\LOG\INFO($poll_ID); + if(!\SYSTEM\SECURITY\Security::isLoggedIn()){ + throw new ERROR("You need to be logged in.");} + + $con = new \SYSTEM\DB\Connection(new \DBD\uVote()); + $res = $con->prepare( 'selVote', + 'SELECT * FROM `uvote_votes` WHERE ID = ?;', + array($poll_ID)); + $vote = votes::getVoteOfGroup($poll_ID); + new INFO(print_r($vote, true)); + $vars = array('vote_text' => $vote['text'], 'vote_title' => $vote['title'], 'vote_init' => $vote['initiative'], 'poll_ID' => $vote['ID'], 'time_end' => $vote['time_end']); + $result = SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vars); + return $res; + } } diff --git a/uVote/page/default_page/css/default_page.css b/uVote/page/default_page/css/default_page.css index b361347..a380817 100644 --- a/uVote/page/default_page/css/default_page.css +++ b/uVote/page/default_page/css/default_page.css @@ -1,4 +1,8 @@ body { padding-top: 60px; padding-bottom: 40px; +} + +#list { + border: 2px solid #ccc; } \ No newline at end of file diff --git a/uVote/page/default_page/default_page.php b/uVote/page/default_page/default_page.php index 76aa407..1c88411 100644 --- a/uVote/page/default_page/default_page.php +++ b/uVote/page/default_page/default_page.php @@ -17,12 +17,25 @@ class default_page extends SYSTEM\PAGE\Page { return '';} public function generate_votelist(){ + $result = ""; $votes = votes::getAllVotesOfGroup(1); foreach($votes as $vote){ - $vars = array('vote_title' => $vote['title'], 'vote_text' => $vote['text'], 'poll_ID' => $vote['ID'], 'time_end' => $vote['time_end']); + $vars = array('vote_title' => $vote['title'], 'vote_text' => $vote['text'], 'vote_init' => $vote['initiative'], 'poll_ID' => $vote['ID'], 'time_end' => $vote['time_end']); $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/vote.tpl'), $vars); } + new \SYSTEM\LOG\INFO("generated votelist successfully"); + return $result; + } + + public function generate_vote(){ + $result = ""; + $votes = votes::getAllVotesOfGroup(1); + + foreach($votes as $vote){ + $vars = array('vote_title' => $vote['title'], 'vote_text' => $vote['text'], 'vote_init' => $vote['initiative'], 'poll_ID' => $vote['ID'], 'time_end' => $vote['time_end']); + $result .= SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/full_vote.tpl'), $vars); + } return $result; } @@ -44,6 +57,7 @@ class default_page extends SYSTEM\PAGE\Page { $vars['js'] = $this->js(); $vars['css'] = $this->css(); $vars['votelist'] = $this->generate_votelist(); + $vars['vote'] = $this->generate_vote(); $vars['registerform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->getloggedinform() : $this->exchange_registerform(); $vars['loginform'] = \SYSTEM\SECURITY\Security::isLoggedIn() ? $this->exchange_loginform() : $this->getloginform() ; $vars['PIC_PATH'] = SYSTEM\WEBPATH(new PPAGE(),'default_page/pics/'); diff --git a/uVote/page/default_page/full_vote.tpl b/uVote/page/default_page/full_vote.tpl new file mode 100644 index 0000000..0747e6a --- /dev/null +++ b/uVote/page/default_page/full_vote.tpl @@ -0,0 +1,21 @@ +
+
+
+

${vote_title}

+ Initiiert von: ${vote_init} +
+
+ Pro » + Contra » + Enthaltung »--> + +
+
+
+
+
+
+ +
\ No newline at end of file diff --git a/uVote/page/default_page/js/loadtexts.js b/uVote/page/default_page/js/loadtexts.js index 9097858..bfeaaf0 100644 --- a/uVote/page/default_page/js/loadtexts.js +++ b/uVote/page/default_page/js/loadtexts.js @@ -6,6 +6,10 @@ $(document).ready(function() { //loadUrlPic($(this).attr('url')); }); + $('.btn_vote').click(function () { + //vote_click($(this).attr('poll_ID')); + open_vote($(this).attr('poll_ID')); + }); $('.btnvote_yes').click(function () { vote_click($(this).attr('poll_ID'),1); }); @@ -117,6 +121,17 @@ function vote_click (poll_ID, vote) { }); } +function open_vote (poll_ID) { + $.getJSON('./api.php?call=vote&action=open_vote&poll_ID=' + poll_ID , function(data) { + var items = []; + if(data.status == true){ + alert("sucess"); + } else { + alert(data.result.message); + } + }); +} + function loadAjaxContent(url) { var dataTmp; $.get(url, function (data) { diff --git a/uVote/page/default_page/page.html b/uVote/page/default_page/page.html index c9ace4f..81c5db5 100644 --- a/uVote/page/default_page/page.html +++ b/uVote/page/default_page/page.html @@ -38,63 +38,22 @@
  • Download
    • + ${loginform} +
    - -
    - - +
    -
    - - -
    - - - ${registerform} - -
    - +
    + ${votelist} +
    +
    - - - -
    - -
    -
    - - -
    -
    - - - -
    - ${votelist} -
    - -
    -
    -

    Entwurf der Seite von Tobias Rechel, Mojotrollz.eu

    +
    -
    -
    - \ No newline at end of file diff --git a/uVote/page/default_page/vote.tpl b/uVote/page/default_page/vote.tpl index 3f062b0..dcb3cbc 100644 --- a/uVote/page/default_page/vote.tpl +++ b/uVote/page/default_page/vote.tpl @@ -1,29 +1,25 @@ -
    -
    +
    +
    -

    ${vote_title}

    +

    ${vote_title}

    + Initiiert von: ${vote_init} +
    + Politikfeld(er):
    -
    - Pro » - Contra » - Enthaltung » + Abstimmen + -
    -
    +
    - - -
    -
    - -
    -
    \ No newline at end of file diff --git a/uVote/sai/autoload.inc.php b/uVote/sai/autoload.inc.php new file mode 100644 index 0000000..4fcc22b --- /dev/null +++ b/uVote/sai/autoload.inc.php @@ -0,0 +1,3 @@ +