Skip to content

Commit

Permalink
Merge pull request #729 from fpcorso/dev
Browse files Browse the repository at this point in the history 
6.0.3 Release
  • Loading branch information
Frank Corso authored Aug 21, 2018
2 parents 075a8ed + 1b9f692 commit fa19edf
Show file tree
Hide file tree
Showing 9 changed files with 375 additions and 296 deletions.
9 changes: 9 additions & 0 deletions ISSUE_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
**IF YOU DO NOT FOLLOW THIS TEMPLATE, YOUR ISSUE MAY BE CLOSED!!**

Please provide the following information when creating your issues:

## Site Info
WordPress Version:
QSM Version:
Browser:

## General description
If this is a bug, give a general description of what you are experiencing. If this is a feature request, include what the feature is that you are requesting.

Link to quiz or screenshot (if relevant):

## Expected behavior
If you are reporting a bug, please describe what you are expecting the plugin to do. If this is a feature request, delete this section.

Expand Down
253 changes: 146 additions & 107 deletions js/qmn_quiz.js → js/qsm-quiz.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,44 +34,177 @@ var QSM;
initTimer: function( quizID ) {

// Gets our form
$quizForm = QSM.getQuizForm( quizID );
var $quizForm = QSM.getQuizForm( quizID );

// Creates timer status key.
qmn_quiz_data[ quizID ].timerStatus = false;

// If we are using the newer pagination system...
if ( 0 < $quizForm.children( '.qsm-page' ).length ) {
// If there is a first page...
if ( qmn_quiz_data[quizID].hasOwnProperty('first_page') && qmn_quiz_data[quizID].first_page ) {
// ... attach an event handler to the click event to activate the timer.
jQuery( '#quizForm' + quizID ).closest( '.qmn_quiz_container' ).find( '.mlw_next' ).on( 'click', function(event) {
$( '#quizForm' + quizID ).closest( '.qmn_quiz_container' ).find( '.mlw_next' ).on( 'click', function(event) {
event.preventDefault();
if ( !qmn_timer_activated && qmnValidatePage( 'quizForm' + quizID ) ) {
qmnActivateTimer( quizID );
if ( ! qmn_quiz_data[ quizID ].timerStatus && qmnValidatePage( 'quizForm' + quizID ) ) {
QSM.activateTimer( quizID );
}
});
// ...else, activate the timer on page load.
} else {
qmnActivateTimer( quizID );
QSM.activateTimer( quizID );
}
// ...else, we must be using the questions per page option.
} else {
if ( qmn_quiz_data[quizID].hasOwnProperty('pagination') && qmn_quiz_data[quizID].first_page ) {
jQuery( '#quizForm' + quizID ).closest( '.qmn_quiz_container' ).find( '.mlw_next' ).on( 'click', function(event) {
$( '#quizForm' + quizID ).closest( '.qmn_quiz_container' ).find( '.mlw_next' ).on( 'click', function(event) {
event.preventDefault();
if ( !qmn_timer_activated && ( 0 == $( '.quiz_begin:visible' ).length || ( 1 == $( '.quiz_begin:visible' ).length && qmnValidatePage( 'quizForm' + quizID ) ) ) ) {
qmnActivateTimer( quizID );
if ( ! qmn_quiz_data[ quizID ].timerStatus && ( 0 == $( '.quiz_begin:visible' ).length || ( 1 == $( '.quiz_begin:visible' ).length && qmnValidatePage( 'quizForm' + quizID ) ) ) ) {
QSM.activateTimer( quizID );
}
});
} else {
qmnActivateTimer( quizID );
QSM.activateTimer( quizID );
}
}
},
/**
* Starts the timer for the quiz.
*
* @param int quizID The ID of the quiz.
*/
activateTimer: function( quizID ) {

// Gets our form.
var $timer = QSM.getTimer( quizID );

// Sets up our variables.
qmn_quiz_data[ quizID ].timerStatus = true;
var seconds = 0;

// Calculates starting time.
var timerStarted = localStorage.getItem( 'mlw_started_quiz' + quizID );
var timerRemaning = localStorage.getItem( 'mlw_time_quiz' + quizID );
if ( 'yes' == timerStarted && 0 < timerRemaning ) {
seconds = parseInt( timerRemaning );
} else {
seconds = parseFloat( qmn_quiz_data[ quizID ].timer_limit ) * 60;
}
qmn_quiz_data[ quizID ].timerRemaning = seconds;

// Makes the timer appear.
$timer.show();
$timer.text( QSM.secondsToTimer( seconds ) );

// Sets up timer interval.
qmn_quiz_data[ quizID ].timerInterval = setInterval( QSM.timer, 1000, quizID );
},
/**
* Reduces the timer by one second and checks if timer is 0
*
* @param int quizID The ID of the quiz.
*/
timer: function( quizID ) {
qmn_quiz_data[ quizID ].timerRemaning -= 1;
if ( 0 > qmn_quiz_data[ quizID ].timerRemaning ) {
qmn_quiz_data[ quizID ].timerRemaning = 0;
}
var secondsRemaining = qmn_quiz_data[ quizID ].timerRemaning;
var display = QSM.secondsToTimer( secondsRemaining );

// Sets our local storage values for the timer being started and current timer value.
localStorage.setItem( 'mlw_time_quiz' + quizID, secondsRemaining );
localStorage.setItem( 'mlw_started_quiz' + quizID, "yes" );

// Updates timer element and title on browser tab.
var $timer = QSM.getTimer( quizID );
$timer.text( display );
document.title = display + ' ' + qsmTitleText;

// If timer is run out, disable fields.
if ( 0 >= secondsRemaining ) {
clearInterval( qmn_quiz_data[ quizID ].timerInterval );
$( ".mlw_qmn_quiz input:radio" ).attr( 'disabled', true );
$( ".mlw_qmn_quiz input:checkbox" ).attr( 'disabled', true );
$( ".mlw_qmn_quiz select" ).attr( 'disabled', true );
$( ".mlw_qmn_question_comment" ).attr( 'disabled', true );
$( ".mlw_answer_open_text" ).attr( 'disabled', true );
$( ".mlw_answer_number" ).attr( 'disabled', true );

var $quizForm = QSM.getQuizForm( quizID );
$quizForm.closest( '.qmn_quiz_container' ).addClass( 'qsm_timer_ended' );
//document.quizForm.submit();
return;
}
},
/**
* Clears timer interval
*
* @param int quizID The ID of the quiz
*/
endTimer: function( quizID ) {
localStorage.setItem( 'mlw_time_quiz' + quizID, 'completed' );
localStorage.setItem( 'mlw_started_quiz' + quizID, 'no' );
document.title = qsmTitleText;
if ( typeof qmn_quiz_data[ quizID ].timerInterval != 'undefined' ) {
clearInterval( qmn_quiz_data[ quizID ].timerInterval );
}
},
/**
* Converts seconds to 00:00:00 format
*
* @param int seconds The number of seconds
* @return string A string in H:M:S format
*/
secondsToTimer: function( seconds ) {
var formattedTime = '';
seconds = parseInt( seconds );

// Prepares the hours part.
var hours = Math.floor( seconds / 3600 );
if ( 0 === hours) {
formattedTime = '00:';
} else if ( 10 > hours ) {
formattedTime = '0' + hours + ':';
} else {
formattedTime = hours + ':';
}

// Prepares the minutes part.
var minutes = Math.floor( ( seconds % 3600 ) / 60 );
if ( 0 === minutes) {
formattedTime = formattedTime + '00:';
} else if ( 10 > minutes ) {
formattedTime = formattedTime + '0' + minutes + ':';
} else {
formattedTime = formattedTime + minutes + ':';
}

// Prepares the seconds part.
var remainder = Math.floor( ( seconds % 60 ) );
if ( 0 === remainder) {
formattedTime = formattedTime + '00';
} else if ( 10 > remainder ) {
formattedTime = formattedTime + '0' + remainder;
} else {
formattedTime = formattedTime + remainder;
}
return formattedTime;
},
/**
* Gets the jQuery object for the timer
*/
getTimer: function( quizID ) {
var $quizForm = QSM.getQuizForm( quizID );
return $quizForm.children( '.mlw_qmn_timer' );
},
/**
* Sets up pagination for a quiz
*
* @param int quizID The ID of the quiz.
*/
initPagination: function( quizID ) {
$quizForm = QSM.getQuizForm( quizID );
var $quizForm = QSM.getQuizForm( quizID );
if ( 0 < $quizForm.children( '.qsm-page' ).length ) {
$quizForm.children( '.qsm-page' ).hide();
template = wp.template( 'qsm-pagination' );
Expand Down Expand Up @@ -205,8 +338,7 @@ var QSM;
}(jQuery));

// Global Variables
var qmn_timer_activated = false;
var qsmTitleText = window.document.title;
var qsmTitleText = document.title;

function qmnTimeTakenTimer() {
var x = +jQuery( '#timer' ).val();
Expand Down Expand Up @@ -260,8 +392,7 @@ function qmnValidation( element, quiz_form_id ) {
result = false;
}
}
if ( ( qmn_quiz_data[quiz_id].hasOwnProperty('pagination') && qmn_quiz_data[quiz_id].first_page ) || ( window.localStorage.getItem( 'mlw_time_quiz' + quiz_id ) === null ||
window.localStorage.getItem( 'mlw_time_quiz'+quiz_id ) > 0.08 ) ) {
if ( localStorage.getItem( 'mlw_time_quiz' + quiz_id ) === null || localStorage.getItem( 'mlw_time_quiz'+quiz_id ) > 0.08 ) {

if( jQuery( this ).attr( 'class' ).indexOf( 'mlwRequiredNumber' ) > -1 && this.value === "" && +this.value != NaN ) {
qmnDisplayError( number_error, jQuery( this ), quiz_form_id );
Expand Down Expand Up @@ -326,7 +457,7 @@ function qmnFormSubmit( quiz_form_id ) {
qsmEndTimeTakenTimer();

if ( qmn_quiz_data[quiz_id].hasOwnProperty( 'timer_limit' ) ) {
qmnEndTimer( quiz_id );
QSM.endTimer( quiz_id );
}

jQuery( '#' + quiz_form_id + ' input[type=submit]' ).attr( 'disabled', 'disabled' );
Expand Down Expand Up @@ -395,98 +526,6 @@ function qmnInit() {
}
}

function qmnActivateTimer( quiz_id ) {
jQuery( '#quizForm' + quiz_id + ' .mlw_qmn_timer').show();
qmn_timer_activated = true;
var minutes = 0;
if ( window.localStorage.getItem( 'mlw_started_quiz' + quiz_id ) == "yes" &&
window.localStorage.getItem( 'mlw_time_quiz' + quiz_id ) >= 0 ) {
minutes = window.localStorage.getItem( 'mlw_time_quiz' + quiz_id );
} else {
minutes = qmn_quiz_data[quiz_id].timer_limit;
}
window.amount = minutes * 60;

jQuery( '#quizForm' + quiz_id + ' .mlw_qmn_timer').html( window.amount );
window.qsmCounter = setInterval( qmnTimer, 1000, quiz_id );
}

function qmnTimer( quiz_id ) {
window.amount = window.amount - 1;
if (window.amount < 0) {
window.amount = 0;
}
window.localStorage.setItem( 'mlw_time_quiz' + quiz_id, window.amount / 60 );
window.localStorage.setItem( 'mlw_started_quiz' + quiz_id, "yes" );
jQuery( '#quizForm' + quiz_id + ' .mlw_qmn_timer').html( qmnMinToSec( window.amount ) );
window.document.title = qmnMinToSec( window.amount ) + " " + qsmTitleText;
if ( window.amount <= 0 ) {
clearInterval( window.qsmCounter );
jQuery( ".mlw_qmn_quiz input:radio" ).attr( 'disabled',true );
jQuery( ".mlw_qmn_quiz input:checkbox" ).attr( 'disabled',true );
jQuery( ".mlw_qmn_quiz select" ).attr( 'disabled',true );
jQuery( ".mlw_qmn_question_comment" ).attr( 'disabled',true );
jQuery( ".mlw_answer_open_text" ).attr( 'disabled',true );
jQuery( ".mlw_answer_number" ).attr( 'disabled',true );
jQuery( '#quizForm' + quiz_id ).closest( '.qmn_quiz_container' ).addClass( 'qsm_timer_ended' );
//document.quizForm.submit();
return;
}
}

function qmnEndTimer( quiz_id ) {
window.localStorage.setItem('mlw_time_quiz' + quiz_id, 'completed');
window.localStorage.setItem('mlw_started_quiz' + quiz_id, 'no');
window.document.title = qsmTitleText;
if ( typeof window.qsmCounter != 'undefined' ) {
clearInterval( window.qsmCounter );
}
}

function qmnMinToSec( amount ) {
var timer_display = '';
var hours = Math.floor(amount/3600);
if (hours == '0')
{
timer_display = timer_display +"00:";
}
else if (hours < 10)
{
timer_display = timer_display + '0' + hours + ":";
}
else
{
timer_display = timer_display + hours + ":";
}
var minutes = Math.floor((amount % 3600)/60);
if (minutes == '0')
{
timer_display = timer_display +"00:";
}
else if (minutes < 10)
{
timer_display = timer_display + '0' + minutes + ":";
}
else
{
timer_display = timer_display + minutes + ":";
}
var seconds = Math.floor(amount % 60);
if (seconds == '0')
{
timer_display = timer_display +"00";
}
else if (seconds < 10)
{
timer_display = timer_display +'0' + seconds;
}
else
{
timer_display = timer_display + seconds;
}
return timer_display;
}

//Function to validate the answers provided in quiz
function qmnValidatePage( quiz_form_id ) {
var result = qmnValidation( '#' + quiz_form_id + ' .quiz_section:visible *', quiz_form_id );
Expand Down
6 changes: 3 additions & 3 deletions mlw_quizmaster2.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
/**
* Plugin Name: Quiz And Survey Master
* Description: Easily and quickly add quizzes and surveys to your website.
* Version: 6.0.2
* Version: 6.0.3
* Author: Frank Corso
* Author URI: https://www.quizandsurveymaster.com/
* Plugin URI: https://www.quizandsurveymaster.com/
* Text Domain: quiz-master-next
*
* @author Frank Corso
* @version 6.0.2
* @version 6.0.3
* @package QSM
*/

Expand All @@ -33,7 +33,7 @@ class MLWQuizMasterNext {
* @var string
* @since 4.0.0
*/
public $version = '6.0.2';
public $version = '6.0.3';

/**
* QSM Alert Manager Object
Expand Down
1 change: 1 addition & 0 deletions php/admin/about-page.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ function mlw_generate_about_page() {
</div>
<div class="qsm-tab-content tab-2" style="display: none;">
<h2>Changelog</h2>
<?php QSM_Changelog_Generator::get_changelog_list( 'fpcorso/quiz_master_next', 55 ); ?>
<?php QSM_Changelog_Generator::get_changelog_list( 'fpcorso/quiz_master_next', 54 ); ?>
<?php QSM_Changelog_Generator::get_changelog_list( 'fpcorso/quiz_master_next', 53 ); ?>
<?php QSM_Changelog_Generator::get_changelog_list( 'fpcorso/quiz_master_next', 36 ); ?>
Expand Down
7 changes: 6 additions & 1 deletion php/admin/quizzes-page.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,14 @@ function qsm_generate_quizzes_surveys_page() {
?>
<div class="qsm-news-ads">
<h3 class="qsm-news-ads-title"><?php _e( 'QSM News', 'quiz-master-next' ); ?></h3>
<div class="qsm-info-widget">
<h3>Keep your WordPress site healthy and secure!</h3>
<p>Easily monitor your WordPress sites to ensure they stay up, healthy, and secure with our new WordPress plugin, WP Health!</p>
<a target="_blank" href="http://bit.ly/2Mr2SqC" class="button-primary"><?php esc_html_e( 'Learn More', 'quiz-master-next' ); ?></a>
</div>
<div class="qsm-info-widget">
<h3><?php _e( 'Subscribe to our newsletter!', 'quiz-master-next' ); ?></h3>
<p><?php _e( 'Join our mailing list and receive a discount on your next purchase! Learn about our newest features, receive email-only promotions, receive tips and guides, and more!', 'quiz-master-next' ); ?></p>
<p><?php _e( 'Join our mailing list to learn about our newest features, receive email-only promotions, receive tips and guides, and more!', 'quiz-master-next' ); ?></p>
<a target="_blank" href="http://quizandsurveymaster.com/subscribe-to-our-newsletter/?utm_source=qsm-quizzes-page&utm_medium=plugin&utm_campaign=qsm_plugin&utm_content=subscribe-to-newsletter" class="button-primary"><?php _e( 'Subscribe Now', 'quiz-master-next' ); ?></a>
</div>
<?php
Expand Down
Loading

0 comments on commit fa19edf

Please sign in to comment.