';
+ $output .= theme('links', $links, array('class' => 'decisions_selection_1click'));
+ $output .= '
';
+ }
+ $form['choices']['1click'] = array(
+ '#value' => $output,
+ );
+ //If asynchronous voting is enabled, add the necessary JS.
+ if (variable_get('decisions_ahah', 0) == 1) {
+ drupal_add_js(drupal_get_path('module', 'selection') . '/selection.js');
+ }
+ //At this point, we can return the form since 1-click uses its own callback for vote submission.
+ return $form;
+ }
+ //Not using 1-click. Use radios.
+ else {
+ foreach ($node->choice as $i => $choice) {
+ if ($choice['label']) {
+ $list[$i] = check_plain($choice['label']);
+ }
+ }
+ }
$form['choice'] = array(
'#type' => 'radios',
'#title' => $page ? '' : check_plain($node->title),
@@ -66,8 +181,8 @@ function decisions_selection_voting_form
'#options' => $list,
);
}
+ //Approval/multiple-choice voting.
else {
- // approval voting
foreach ($node->choice as $i => $choice) {
if ($choice['label']) {
$list[$i] = check_plain($choice['label']);
@@ -80,6 +195,7 @@ function decisions_selection_voting_form
);
}
}
+ //Add the submit button. 1click has already returned the form by this point.
$form['vote'] = array(
'#type' => 'submit',
'#value' => t('Vote'),
@@ -92,13 +208,11 @@ function decisions_selection_voting_form
*
* TODO: implement (http://drupal.org/node/48249)
*/
-function selection_decisions_view_results($node, $teaser, $page) {
-
+function selection_decisions_view_results($node, $teaser, $page, $this_vote = array()) {
$output = "";
- $results = votingapi_select_votes(array('content_id' => $node->nid, 'content_type' => 'decisions'));
+ $results = votingapi_select_results(array('content_id' => $node->nid, 'content_type' => 'decisions'));
// Count the votes for each choice
$votes = array();
-
foreach ($results as $result) {
// approval
@@ -123,6 +237,17 @@ function selection_decisions_view_result
if ($node->choice && $total_votes > 0) {
// TODO: Those s and
s should be in a theme function. First collect all the data in a structure, then theme it.
// display results for each possible choice
+
+ //If AHAH and 1click are enabled, ensure that the fallback behavior shows the same vote confirmation.
+ if (variable_get('decisions_ahah', 0) == 1 && variable_get('decisions_ahah', 0) == 1 && ($node->maxchoices == 1)) {
+ if (empty($this_vote)) {
+ //Fallback behavior.
+ $this_vote = selection_get_votes($node->nid, $user->uid);
+ }
+ $this_vote = array_shift($this_vote);
+ $vote_label = $node->choice[$this_vote['tag']]['label'];
+ $output .= '
' . t('You voted: @vote_tag', array('@vote_tag' => $vote_label)) . '';
+ }
$output .= '
';
$max_votes = 0;
foreach ($votes as $i => $vote) {
@@ -134,7 +259,6 @@ function selection_decisions_view_result
}
$output .= '
';
}
-
$output .= '
';
return $output;
}
@@ -157,11 +281,28 @@ function selection_decisions_format_vote
return implode(', ', $unordered_votes);
}
+function selection_get_votes($nid, $uid) {
+ $criteria['content_id'] = $nid;
+ $criteria['value_type'] = 'option';
+ $criteria['content_type'] = 'decisions';
+ $criteria['content_id'] = $nid;
+ if ($uid == 0) {
+ $criteria['vote_source'] = ip_address();
+ }
+ else {
+ $criteria['uid'] = $uid;
+ }
+ $results = votingapi_select_votes($criteria);
+ return $results;
+}
/**
* Registers the vote as a key for this node using votingapi_set_vote().
*/
function decisions_selection_voting_form_submit($form, &$form_state) {
$node = $form_state['values']['node'];
+ $one_click = variable_get('decisions_1click', 0);
+ global $user;
+ $node = $form_state['values']['node'];
$votes = array();
if ($node->maxchoices == 1) {
// plurality voting
@@ -190,6 +331,8 @@ function decisions_selection_voting_form
}
}
votingapi_add_votes($votes);
+ //If this becomes a performance problem, we use votingapi_set_votes and the site-wide recalculation time.
+ votingapi_recalculate_results('decisions', $node->nid);
drupal_set_message(t('Your vote was registered.'));
}
@@ -203,24 +346,15 @@ function decisions_selection_voting_form
function decisions_selection_voting_form_validate($form, &$form_state) {
$node = $form_state['values']['node'];
if ($node->maxchoices == 1) {
- // plurality voting
if (!array_key_exists($form_state['values']['choice'], $node->choice)) {
form_set_error('choice', 'At least one choice must be selected.');
}
}
else {
- // approval voting
-
+ //Approval/Multiple-choice voting
// array used to check which values are set
$setvalues = array();
foreach ($node->choice as $key => $choice) {
-
- // need a minchoices choice to do this
- //if (empty($_POST['edit']['Choice_' . $key])) {
- //form_set_error('Choice_'.$key, "choice $key cannot be empty");
- //$ok = FALSE;
- //}
-
// see if the box is checked
if (!empty($form_state['values']['choice'][$key])) {
$numchoices++;
@@ -235,7 +369,6 @@ function decisions_selection_voting_form
)
);
}
-
// not enough choices ranked
$minchoices = 1;
if ($numchoices < $minchoices) {